summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix/pvfs_lock.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-07 10:05:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:37 -0500
commit2db915e06564b42bf7ebfa526b1af2e42e591590 (patch)
treea6cb2c29dcdc0278f8afd5b2ed9bdff9dce73d00 /source4/ntvfs/posix/pvfs_lock.c
parent5f608f23d32003456ebeed0ef6afdfd3f40aea25 (diff)
downloadsamba-2db915e06564b42bf7ebfa526b1af2e42e591590.tar.gz
samba-2db915e06564b42bf7ebfa526b1af2e42e591590.tar.bz2
samba-2db915e06564b42bf7ebfa526b1af2e42e591590.zip
r3595: - fixed a talloc_free ordering problem on cleanup with pending requests
- added initial support for MODE_INFORMATION in setfileinfo (I have no idea what "mode information" on a file is - it takes a value of 0, 2, 4 or 6. What could it be?) (This used to be commit e53ec2f6b68e1d19149c36ea8fcd25a204db38fb)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_lock.c')
-rw-r--r--source4/ntvfs/posix/pvfs_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 446ff1f30b..c8fc6c2de3 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -295,7 +295,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(req, struct pvfs_pending_lock);
+ pending = talloc_p(f, struct pvfs_pending_lock);
if (pending == NULL) {
return NT_STATUS_NO_MEMORY;
}