sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

pvfs_rename: move odb_rename() onto pvfs_do_rename()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2008-03-01 10:05:25 +01:00
parent b5db8defca
commit 5a1f0c0ce9
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/ntvfs/posix/pvfs_rename.c
View File

@ -28,16 +28,22 @@
/* /*
do a file rename, and send any notify triggers do a file rename, and send any notify triggers
*/ */
NTSTATUS pvfs_do_rename(struct pvfs_state *pvfs, const struct pvfs_filename *name1, NTSTATUS pvfs_do_rename(struct pvfs_state *pvfs,
struct odb_lock *lck,
const struct pvfs_filename *name1,
const char *name2) const char *name2)
{ {
const char *r1, *r2; const char *r1, *r2;
uint32_t mask; uint32_t mask;
NTSTATUS status;
if (rename(name1->full_name, name2) == -1) { if (rename(name1->full_name, name2) == -1) {
return pvfs_map_errno(pvfs, errno); return pvfs_map_errno(pvfs, errno);
} }
status = odb_rename(lck, name2);
NT_STATUS_NOT_OK_RETURN(status);
if (name1->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) { if (name1->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) {
mask = FILE_NOTIFY_CHANGE_DIR_NAME; mask = FILE_NOTIFY_CHANGE_DIR_NAME;
} else { } else {
@ -315,11 +321,7 @@ static NTSTATUS pvfs_rename_one(struct pvfs_state *pvfs,
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
status = pvfs_do_rename(pvfs, name1, fname2); status = pvfs_do_rename(pvfs, lck, name1, fname2);
if (NT_STATUS_IS_OK(status)) {
status = odb_rename(lck, fname2);
}
failed: failed:
talloc_free(mem_ctx); talloc_free(mem_ctx);
@ -448,9 +450,9 @@ static NTSTATUS pvfs_rename_mv(struct ntvfs_module_context *ntvfs,
return status; return status;
} }
status = pvfs_do_rename(pvfs, name1, name2->full_name); status = pvfs_do_rename(pvfs, lck, name1, name2->full_name);
if (NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
status = odb_rename(lck, name2->full_name); return status;
} }
return NT_STATUS_OK; return NT_STATUS_OK;
@ -532,10 +534,7 @@ static NTSTATUS pvfs_rename_nt(struct ntvfs_module_context *ntvfs,
case RENAME_FLAG_RENAME: case RENAME_FLAG_RENAME:
status = pvfs_access_check_parent(pvfs, req, name2, SEC_DIR_ADD_FILE); status = pvfs_access_check_parent(pvfs, req, name2, SEC_DIR_ADD_FILE);
NT_STATUS_NOT_OK_RETURN(status); NT_STATUS_NOT_OK_RETURN(status);
status = pvfs_do_rename(pvfs, name1, name2->full_name); status = pvfs_do_rename(pvfs, lck, name1, name2->full_name);
if (NT_STATUS_IS_OK(status)) {
status = odb_rename(lck, name2->full_name);
}
NT_STATUS_NOT_OK_RETURN(status); NT_STATUS_NOT_OK_RETURN(status);
break; break;

5
source/ntvfs/posix/pvfs_setfileinfo.c
View File

@ -171,10 +171,7 @@ static NTSTATUS pvfs_setfileinfo_rename(struct pvfs_state *pvfs,
return NT_STATUS_INTERNAL_DB_CORRUPTION; return NT_STATUS_INTERNAL_DB_CORRUPTION;
} }
status = pvfs_do_rename(pvfs, name, name2->full_name); status = pvfs_do_rename(pvfs, lck, name, name2->full_name);
if (NT_STATUS_IS_OK(status)) {
status = odb_rename(lck, name2->full_name);
}
talloc_free(lck); talloc_free(lck);
NT_STATUS_NOT_OK_RETURN(status); NT_STATUS_NOT_OK_RETURN(status);
if (NT_STATUS_IS_OK(status)) { if (NT_STATUS_IS_OK(status)) {