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

smbd: Pass "dirfsp" and "smb_fname" to fd_open_atomic()

Browse Source 
Dereference fsp once instead of four times

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2022-01-18 21:14:13 +01:00
committed by Jeremy Allison
parent 1850170708
commit c2ac6a9cd7
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source3/smbd/open.c
View File

@ -1057,7 +1057,9 @@ static NTSTATUS change_dir_owner_to_parent_fsp(struct files_struct *parent_fsp,
file was created or not. file was created or not.
****************************************************************************/ ****************************************************************************/
static NTSTATUS fd_open_atomic(files_struct *fsp, static NTSTATUS fd_open_atomic(struct files_struct *dirfsp,
struct smb_filename *smb_fname,
files_struct *fsp,
int flags, int flags,
mode_t mode, mode_t mode,
bool *file_created) bool *file_created)
@ -1071,7 +1073,7 @@ static NTSTATUS fd_open_atomic(files_struct *fsp,
/* /*
* We're not creating the file, just pass through. * We're not creating the file, just pass through.
*/ */
status = fd_openat(fsp->conn->cwd_fsp, fsp->fsp_name, fsp, flags, mode); status = fd_openat(dirfsp, smb_fname, fsp, flags, mode);
*file_created = false; *file_created = false;
return status; return status;
} }
@ -1080,7 +1082,7 @@ static NTSTATUS fd_open_atomic(files_struct *fsp,
/* /*
* Fail if already exists, just pass through. * Fail if already exists, just pass through.
*/ */
status = fd_openat(fsp->conn->cwd_fsp, fsp->fsp_name, fsp, flags, mode); status = fd_openat(dirfsp, smb_fname, fsp, flags, mode);
/* /*
* Here we've opened with O_CREAT|O_EXCL. If that went * Here we've opened with O_CREAT|O_EXCL. If that went
@ -1120,7 +1122,7 @@ static NTSTATUS fd_open_atomic(files_struct *fsp,
retry_status = NT_STATUS_OBJECT_NAME_COLLISION; retry_status = NT_STATUS_OBJECT_NAME_COLLISION;
} }
status = fd_openat(fsp->conn->cwd_fsp, fsp->fsp_name, fsp, curr_flags, mode); status = fd_openat(dirfsp, smb_fname, fsp, curr_flags, mode);
if (NT_STATUS_IS_OK(status)) { if (NT_STATUS_IS_OK(status)) {
*file_created = !file_existed; *file_created = !file_existed;
return NT_STATUS_OK; return NT_STATUS_OK;
@ -1139,7 +1141,7 @@ static NTSTATUS fd_open_atomic(files_struct *fsp,
curr_flags = flags | O_EXCL; curr_flags = flags | O_EXCL;
} }
status = fd_openat(fsp->conn->cwd_fsp, fsp->fsp_name, fsp, curr_flags, mode); status = fd_openat(dirfsp, smb_fname, fsp, curr_flags, mode);
} }
*file_created = (NT_STATUS_IS_OK(status) && !file_existed); *file_created = (NT_STATUS_IS_OK(status) && !file_existed);
@ -1242,10 +1244,13 @@ static NTSTATUS reopen_from_fsp(struct files_struct *fsp,
fsp->fsp_flags.is_pathref = false; fsp->fsp_flags.is_pathref = false;
status = fd_open_atomic(fsp, status = fd_open_atomic(
flags, fsp->conn->cwd_fsp,
mode, fsp->fsp_name,
p_file_created); fsp,
flags,
mode,
p_file_created);
return status; return status;
} }