sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

vfs: Simplify streams_depot_openat()

Browse Source 
We don't need an explicit stat(), VALID_STAT on the existing base_fsp
is sufficient.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Apr  1 21:18:37 UTC 2022 on sn-devel-184
This commit is contained in:
Volker Lendecke 2022-03-31 18:12:32 +02:00 committed by Jeremy Allison
parent 57bcbbcacd
commit edc4c910f2
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source3/modules/vfs_streams_depot.c
View File

@ -710,7 +710,6 @@ static int streams_depot_openat(struct vfs_handle_struct *handle,
mode_t mode)
{
struct smb_filename *smb_fname_stream = NULL;
struct smb_filename *smb_fname_base = NULL;
struct files_struct *fspcwd = NULL;
NTSTATUS status;
int ret = -1;
@ -725,29 +724,7 @@ static int streams_depot_openat(struct vfs_handle_struct *handle,
}
SMB_ASSERT(fsp_is_alternate_stream(fsp));
/*
* For now assert this so the below SMB_VFS_STAT() is ok.
*/
SMB_ASSERT(fsp_get_pathref_fd(dirfsp) == AT_FDCWD);
/* Ensure the base file still exists. */
smb_fname_base = synthetic_smb_fname(talloc_tos(),
smb_fname->base_name,
NULL,
NULL,
smb_fname->twrp,
smb_fname->flags);
if (smb_fname_base == NULL) {
ret = -1;
errno = ENOMEM;
goto done;
}
ret = SMB_VFS_NEXT_STAT(handle, smb_fname_base);
if (ret == -1) {
goto done;
}
SMB_ASSERT(VALID_STAT(fsp->base_fsp->fsp_name->st));
/* Determine the stream name, and then open it. */
status = stream_smb_fname(handle, smb_fname, &smb_fname_stream, true);
@ -773,7 +750,6 @@ static int streams_depot_openat(struct vfs_handle_struct *handle,
done:
TALLOC_FREE(smb_fname_stream);
TALLOC_FREE(smb_fname_base);
TALLOC_FREE(fspcwd);
return ret;
}