diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-26 16:19:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-26 16:19:57 +1100 |
| commit | 864328e6563621a0b4df2d49e04ff3b23b68e1ca (patch) | |
| tree | 01b5af0b454d7235b5118ae53d078429dca26619 /source4/ntvfs/posix/pvfs_setfileinfo.c | |
| parent | 2c8415f767ca20fe90a97f8623d1617e015f183a (diff) | |
| parent | 1e5ced379361fbdc0ccc48ad012f388f2e737ca7 (diff) | |
| download | samba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.tar.gz samba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.tar.bz2 samba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 35f7f488d84e3ec3224f3b40ff5881e91c11764d)
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; } |