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_setfileinfo.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_setfileinfo.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_setfileinfo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c index 9c78699edb..fbbb8c2d4b 100644 --- a/source4/ntvfs/posix/pvfs_setfileinfo.c +++ b/source4/ntvfs/posix/pvfs_setfileinfo.c @@ -142,8 +142,6 @@ static NTSTATUS pvfs_setfileinfo_rename(struct pvfs_state *pvfs, /* if the destination exists, then check the rename is allowed */ if (name2->exists) { - struct odb_lock *lck; - if (strcmp(name2->full_name, name->full_name) == 0) { /* rename to same name is null-op */ return NT_STATUS_OK; @@ -153,7 +151,7 @@ static NTSTATUS pvfs_setfileinfo_rename(struct pvfs_state *pvfs, return NT_STATUS_OBJECT_NAME_COLLISION; } - status = pvfs_can_delete(pvfs, req, name2, &lck); + status = pvfs_can_delete(pvfs, req, name2, NULL); if (NT_STATUS_EQUAL(status, NT_STATUS_SHARING_VIOLATION)) { return NT_STATUS_ACCESS_DENIED; } |