diff options
author | Stefan Metzmacher <metze@samba.org> | 2008-02-21 19:59:13 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2008-02-25 07:56:06 +0100 |
commit | 1cd2008aa49d38792f273bb28922d33b5b9b0066 (patch) | |
tree | dfcd4bcaa94e673c881a03c49fd4e4c15da4b8e9 /source4/ntvfs/posix/pvfs_unlink.c | |
parent | a0a0d4a5d0c24729a26a37ff54caa665de9149a2 (diff) | |
download | samba-1cd2008aa49d38792f273bb28922d33b5b9b0066.tar.gz samba-1cd2008aa49d38792f273bb28922d33b5b9b0066.tar.bz2 samba-1cd2008aa49d38792f273bb28922d33b5b9b0066.zip |
pvfs: pass NULL to pvfs_can_*() when no odb_lock is needed by the caller
metze
(This used to be commit e585e2306334bd919f567f53d8d08903dfdfb102)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_unlink.c')
-rw-r--r-- | source4/ntvfs/posix/pvfs_unlink.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c index ef56d99fb5..d6e60b59d3 100644 --- a/source4/ntvfs/posix/pvfs_unlink.c +++ b/source4/ntvfs/posix/pvfs_unlink.c @@ -33,7 +33,6 @@ static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs, uint16_t attrib) { NTSTATUS status; - struct odb_lock *lck; if (!name->stream_exists) { return NT_STATUS_OBJECT_NAME_NOT_FOUND; @@ -45,7 +44,7 @@ static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs, return status; } - status = pvfs_can_delete(pvfs, req, name, &lck); + status = pvfs_can_delete(pvfs, req, name, NULL); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -64,7 +63,6 @@ static NTSTATUS pvfs_unlink_one(struct pvfs_state *pvfs, { struct pvfs_filename *name; NTSTATUS status; - struct odb_lock *lck; /* get a pvfs_filename object */ status = pvfs_resolve_partial(pvfs, req, @@ -80,7 +78,7 @@ static NTSTATUS pvfs_unlink_one(struct pvfs_state *pvfs, return status; } - status = pvfs_can_delete(pvfs, req, name, &lck); + status = pvfs_can_delete(pvfs, req, name, NULL); if (!NT_STATUS_IS_OK(status)) { talloc_free(name); return status; |