git.samba.org
/
tprouty
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the
[tprouty/samba.git]
/
source4
/
ntvfs
/
posix
/
pvfs_lock.c
diff --git
a/source4/ntvfs/posix/pvfs_lock.c
b/source4/ntvfs/posix/pvfs_lock.c
index 74ee48ba15bbb536042972ad0a8867650c3e0d33..6ad654f505b602e151d9d4dc2027824a2f40e93b 100644
(file)
--- a/
source4/ntvfs/posix/pvfs_lock.c
+++ b/
source4/ntvfs/posix/pvfs_lock.c
@@
-296,7
+296,7
@@
NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
if (lck->lockx.in.timeout != 0 &&
(req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC)) {
- pending = talloc
_p
(f, struct pvfs_pending_lock);
+ pending = talloc(f, struct pvfs_pending_lock);
if (pending == NULL) {
return NT_STATUS_NO_MEMORY;
}