sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

s3: smbd: Allow check_parent_exists() to return the errno from STAT/LSTAT on the parent name.

Browse Source 
Not yet used.

This will allow us to avoid an duplicate STAT/LSTAT system call
on the parent pathname in a hot code path of the caller in the next commit.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
This commit is contained in:
Jeremy Allison 2021-05-11 11:31:55 -07:00
parent 3f57c6bba6
commit 6e0680ce07
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/smbd/filename.c
View File

@ -162,7 +162,8 @@ static NTSTATUS check_parent_exists(TALLOC_CTX *ctx,
bool posix_pathnames,
const struct smb_filename *smb_fname,
char **pp_dirpath,
char **pp_start)
char **pp_start,
int *p_parent_stat_errno)
{
char *parent_name = NULL;
struct smb_filename *parent_fname = NULL;
@ -211,6 +212,16 @@ static NTSTATUS check_parent_exists(TALLOC_CTX *ctx,
with the normal tree walk. */
if (ret == -1) {
/*
* Optimization. Preserving the
* errno from the STAT/LSTAT here
* will allow us to save a duplicate
* STAT/LSTAT system call of the parent
* pathname in a hot code path in the caller.
*/
if (p_parent_stat_errno != NULL) {
*p_parent_stat_errno = errno;
}
goto no_optimization_out;
}
@ -1206,7 +1217,8 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
state->posix_pathnames,
state->smb_fname,
&state->dirpath,
&state->name);
&state->name,
NULL);
errno = saved_errno;
if (!NT_STATUS_IS_OK(status)) {
goto fail;
@ -1287,7 +1299,8 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
state->posix_pathnames,
state->smb_fname,
&state->dirpath,
&state->name);
&state->name,
NULL);
errno = saved_errno;
if (!NT_STATUS_IS_OK(status)) {
goto fail;