sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

vfs: Add dirfsp arg to SMB_VFS_READDIR()

Browse Source 
This allows for optimisations in VFS module: by passing the dirfsp as an
additional arg, the function can check fsp->fsp_name->flags which may include eg
SMB_FILENAME_POSIX_PATH to trigger POSIX pathname processing.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2020-11-22 13:57:27 +01:00
parent 985c1be5cc
commit dba8593c6f
20 changed files with 89 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/VFS/skel_opaque.c
View File

@ -156,7 +156,9 @@ static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp,
}
static struct dirent *skel_readdir(vfs_handle_struct *handle,
DIR *dirp, SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
return NULL;
}

6
examples/VFS/skel_transparent.c
View File

@ -164,9 +164,11 @@ static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp,
}
static struct dirent *skel_readdir(vfs_handle_struct *handle,
DIR *dirp, SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
return SMB_VFS_NEXT_READDIR(handle, dirp, sbuf);
return SMB_VFS_NEXT_READDIR(handle, dirfsp, dirp, sbuf);
}
static void skel_seekdir(vfs_handle_struct *handle, DIR *dirp, long offset)

15
source3/include/vfs.h
View File

@ -337,6 +337,7 @@
* Version 44 - Add 'is_fsa' flag to struct files_struct.
* Version 44 - Add 'have_proc_fds' flag to struct connection_struct.
* Version 44 - Add 'have_proc_fds' flag to struct files_struct.
* Version 44 - Add dirfsp arg to SMB_VFS_READDIR()
*/
#define SMB_VFS_INTERFACE_VERSION 44
@ -919,8 +920,9 @@ struct vfs_fn_pointers {
DIR *(*fdopendir_fn)(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32_t attributes);
struct dirent *(*readdir_fn)(struct vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf);
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf);
void (*seekdir_fn)(struct vfs_handle_struct *handle, DIR *dirp, long offset);
long (*telldir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
void (*rewind_dir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
@ -1432,8 +1434,9 @@ DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
const char *mask,
uint32_t attributes);
struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf);
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf);
void smb_vfs_call_seekdir(struct vfs_handle_struct *handle,
DIR *dirp, long offset);
long smb_vfs_call_telldir(struct vfs_handle_struct *handle,
@ -1894,7 +1897,9 @@ NTSTATUS vfs_not_implemented_snap_delete(struct vfs_handle_struct *handle,
DIR *vfs_not_implemented_fdopendir(vfs_handle_struct *handle, files_struct *fsp,
const char *mask, uint32_t attr);
struct dirent *vfs_not_implemented_readdir(vfs_handle_struct *handle,
DIR *dirp, SMB_STRUCT_STAT *sbuf);
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf);
void vfs_not_implemented_seekdir(vfs_handle_struct *handle, DIR *dirp, long offset);
long vfs_not_implemented_telldir(vfs_handle_struct *handle, DIR *dirp);
void vfs_not_implemented_rewind_dir(vfs_handle_struct *handle, DIR *dirp);

8
source3/include/vfs_macros.h
View File

@ -111,10 +111,10 @@
#define SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr) \
smb_vfs_call_fdopendir((handle)->next, (fsp), (mask), (attr))
#define SMB_VFS_READDIR(conn, dirp, sbuf) \
smb_vfs_call_readdir((conn)->vfs_handles, (dirp), (sbuf))
#define SMB_VFS_NEXT_READDIR(handle, dirp, sbuf) \
smb_vfs_call_readdir((handle)->next, (dirp), (sbuf))
#define SMB_VFS_READDIR(conn, dirfsp, dirp, sbuf) \
smb_vfs_call_readdir((conn)->vfs_handles, (dirfsp), (dirp), (sbuf))
#define SMB_VFS_NEXT_READDIR(handle, dirfsp, dirp, sbuf) \
smb_vfs_call_readdir((handle)->next, (dirfsp), (dirp), (sbuf))
#define SMB_VFS_SEEKDIR(conn, dirp, offset) \
smb_vfs_call_seekdir((conn)->vfs_handles, (dirp), (offset))

7
source3/modules/vfs_cap.c
View File

@ -85,8 +85,9 @@ static int cap_get_quota(vfs_handle_struct *handle,
}
static struct dirent *cap_readdir(vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
struct dirent *result;
struct dirent *newdirent;
@ -94,7 +95,7 @@ static struct dirent *cap_readdir(vfs_handle_struct *handle,
size_t newnamelen;
DEBUG(3,("cap: cap_readdir\n"));
result = SMB_VFS_NEXT_READDIR(handle, dirp, NULL);
result = SMB_VFS_NEXT_READDIR(handle, dirfsp, dirp, NULL);
if (!result) {
return NULL;
}

1
source3/modules/vfs_ceph.c
View File

@ -321,6 +321,7 @@ static DIR *cephwrap_fdopendir(struct vfs_handle_struct *handle,
}
static struct dirent *cephwrap_readdir(struct vfs_handle_struct *handle,
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{

5
source3/modules/vfs_default.c
View File

@ -571,8 +571,9 @@ static DIR *vfswrap_fdopendir(vfs_handle_struct *handle,
static struct dirent *vfswrap_readdir(vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
struct dirent *result;

15
source3/modules/vfs_dirsort.c
View File

@ -79,7 +79,10 @@ static bool open_and_sort_dir(vfs_handle_struct *handle,
return false;
}
dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL);
dp = SMB_VFS_NEXT_READDIR(handle,
data->fsp,
data->source_directory,
NULL);
if (dp == NULL) {
return false;
}
@ -120,7 +123,10 @@ static bool open_and_sort_dir(vfs_handle_struct *handle,
data->directory_list[total_count] = *dp;
total_count++;
dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL);
dp = SMB_VFS_NEXT_READDIR(handle,
data->fsp,
data->source_directory,
NULL);
} while (dp != NULL);
data->number_of_entries = total_count;
@ -178,8 +184,9 @@ static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
}
static struct dirent *dirsort_readdir(vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
struct dirsort_privates *data = NULL;
struct timespec current_mtime;

6
source3/modules/vfs_full_audit.c
View File

@ -1004,11 +1004,13 @@ static DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
}
static struct dirent *smb_full_audit_readdir(vfs_handle_struct *handle,
DIR *dirp, SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
struct dirent *result;
result = SMB_VFS_NEXT_READDIR(handle, dirp, sbuf);
result = SMB_VFS_NEXT_READDIR(handle, dirfsp, dirp, sbuf);
/* This operation has no reasonable error condition
* (End of dir is also failure), so always succeed.

4
source3/modules/vfs_glusterfs.c
View File

@ -650,7 +650,9 @@ static int vfs_gluster_closedir(struct vfs_handle_struct *handle, DIR *dirp)
}
static struct dirent *vfs_gluster_readdir(struct vfs_handle_struct *handle,
DIR *dirp, SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
static char direntbuf[512];
int ret;

9
source3/modules/vfs_media_harmony.c
View File

@ -818,8 +818,9 @@ err:
* Failure: set errno, return NULL
*/
static struct dirent *mh_readdir(vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
mh_dirinfo_struct* dirInfo = (mh_dirinfo_struct*)dirp;
struct dirent *d = NULL;
@ -842,7 +843,7 @@ static struct dirent *mh_readdir(vfs_handle_struct *handle,
if (! dirInfo->isInMediaFiles)
{
d = SMB_VFS_NEXT_READDIR(handle, dirInfo->dirstream, sbuf);
d = SMB_VFS_NEXT_READDIR(handle, dirfsp, dirInfo->dirstream, sbuf);
goto out;
}
@ -852,7 +853,7 @@ static struct dirent *mh_readdir(vfs_handle_struct *handle,
bool isAppleDouble;
skip = False;
d = SMB_VFS_NEXT_READDIR(handle, dirInfo->dirstream, sbuf);
d = SMB_VFS_NEXT_READDIR(handle, dirfsp, dirInfo->dirstream, sbuf);
if (d == NULL)
{

4
source3/modules/vfs_not_implemented.c
View File

@ -151,7 +151,9 @@ DIR *vfs_not_implemented_fdopendir(vfs_handle_struct *handle, files_struct *fsp,
}
struct dirent *vfs_not_implemented_readdir(vfs_handle_struct *handle,
DIR *dirp, SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
errno = ENOSYS;
return NULL;

7
source3/modules/vfs_shadow_copy.c
View File

@ -98,7 +98,7 @@ static DIR *shadow_copy_fdopendir(vfs_handle_struct *handle, files_struct *fsp,
while (True) {
struct dirent *d;
d = SMB_VFS_NEXT_READDIR(handle, p, NULL);
d = SMB_VFS_NEXT_READDIR(handle, fsp, p, NULL);
if (d == NULL) {
break;
}
@ -126,8 +126,9 @@ static DIR *shadow_copy_fdopendir(vfs_handle_struct *handle, files_struct *fsp,
}
static struct dirent *shadow_copy_readdir(vfs_handle_struct *handle,
DIR *_dirp,
SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *_dirp,
SMB_STRUCT_STAT *sbuf)
{
shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;

2
source3/modules/vfs_shadow_copy2.c
View File

@ -2052,7 +2052,7 @@ static int shadow_copy2_get_shadow_copy_data(
time(&(priv->snaps->fetch_time));
}
while ((d = SMB_VFS_NEXT_READDIR(handle, p, NULL))) {
while ((d = SMB_VFS_NEXT_READDIR(handle, dirfsp, p, NULL))) {
char snapshot[GMT_NAME_LEN+1];
SHADOW_COPY_LABEL *tlabels;

7
source3/modules/vfs_time_audit.c
View File

@ -467,15 +467,16 @@ static DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,
}
static struct dirent *smb_time_audit_readdir(vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
struct dirent *result;
struct timespec ts1,ts2;
double timediff;
clock_gettime_mono(&ts1);
result = SMB_VFS_NEXT_READDIR(handle, dirp, sbuf);
result = SMB_VFS_NEXT_READDIR(handle, dirfsp, dirp, sbuf);
clock_gettime_mono(&ts2);
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;

5
source3/modules/vfs_unityed_media.c
View File

@ -614,6 +614,7 @@ err:
* Failure: set errno, return NULL
*/
static struct dirent *um_readdir(vfs_handle_struct *handle,
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
@ -631,7 +632,7 @@ static struct dirent *um_readdir(vfs_handle_struct *handle,
dirInfo->clientSubDirname));
if (!dirInfo->isInMediaFiles) {
return SMB_VFS_NEXT_READDIR(handle, dirInfo->dirstream, sbuf);
return SMB_VFS_NEXT_READDIR(handle, dirfsp, dirInfo->dirstream, sbuf);
}
do {
@ -642,7 +643,7 @@ static struct dirent *um_readdir(vfs_handle_struct *handle,
uintmax_t number;
skip = false;
d = SMB_VFS_NEXT_READDIR(handle, dirInfo->dirstream, sbuf);
d = SMB_VFS_NEXT_READDIR(handle, dirfsp, dirInfo->dirstream, sbuf);
if (d == NULL) {
break;

10
source3/modules/vfs_widelinks.c
View File

@ -372,8 +372,9 @@ static int widelinks_openat(vfs_handle_struct *handle,
}
static struct dirent *widelinks_readdir(vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
struct widelinks_config *config = NULL;
struct dirent *result;
@ -384,8 +385,9 @@ static struct dirent *widelinks_readdir(vfs_handle_struct *handle,
return NULL);
result = SMB_VFS_NEXT_READDIR(handle,
dirp,
sbuf);
dirfsp,
dirp,
sbuf);
if (!config->active) {
/* Module not active. */

2
source3/smbd/dir.c
View File

@ -1490,7 +1490,7 @@ const char *ReadDirName(struct smb_Dir *dir_hnd, long *poffset,
/* A real offset, seek to it. */
SeekDir(dir_hnd, *poffset);
while ((n = vfs_readdirname(conn, dir_hnd->dir, sbuf, &talloced))) {
while ((n = vfs_readdirname(conn, dir_hnd->fsp, dir_hnd->dir, sbuf, &talloced))) {
/* Ignore . and .. - we've already returned them. */
if (*n == '.') {
if ((n[1] == '\0') || (n[1] == '.' && n[2] == '\0')) {

7
source3/smbd/proto.h
View File

@ -1287,8 +1287,11 @@ int vfs_slow_fallocate(files_struct *fsp, off_t offset, off_t len);
int vfs_fill_sparse(files_struct *fsp, off_t len);
int vfs_set_blocking(files_struct *fsp, bool set);
off_t vfs_transfer_file(files_struct *in, files_struct *out, off_t n);
const char *vfs_readdirname(connection_struct *conn, void *p,
SMB_STRUCT_STAT *sbuf, char **talloced);
const char *vfs_readdirname(connection_struct *conn,
struct files_struct *dirfsp,
void *p,
SMB_STRUCT_STAT *sbuf,
char **talloced);
int vfs_ChDir(connection_struct *conn,
const struct smb_filename *smb_fname);
struct smb_filename *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn);

16
source3/smbd/vfs.c
View File

@ -842,8 +842,11 @@ off_t vfs_transfer_file(files_struct *in, files_struct *out, off_t n)
A vfs_readdir wrapper which just returns the file name.
********************************************************************/
const char *vfs_readdirname(connection_struct *conn, void *p,
SMB_STRUCT_STAT *sbuf, char **talloced)
const char *vfs_readdirname(connection_struct *conn,
struct files_struct *dirfsp,
void *p,
SMB_STRUCT_STAT *sbuf,
char **talloced)
{
struct dirent *ptr= NULL;
const char *dname;
@ -853,7 +856,7 @@ const char *vfs_readdirname(connection_struct *conn, void *p,
if (!p)
return(NULL);
ptr = SMB_VFS_READDIR(conn, (DIR *)p, sbuf);
ptr = SMB_VFS_READDIR(conn, dirfsp, (DIR *)p, sbuf);
if (!ptr)
return(NULL);
@ -1759,11 +1762,12 @@ DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
}
struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
struct files_struct *dirfsp,
DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
VFS_FIND(readdir);
return handle->fns->readdir_fn(handle, dirp, sbuf);
return handle->fns->readdir_fn(handle, dirfsp, dirp, sbuf);
}
void smb_vfs_call_seekdir(struct vfs_handle_struct *handle,