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

s3: Added SMB_VFS_INIT_SEARCH_OP to initialize data at the beginning of SMB search requests.

Browse Source 
By default this VFS call is a NOOP, but the onefs vfs module takes advantage
of it to initialize direntry search caches at the beginning of each
TRANS2_FIND_FIRST, TRANS2_FIND_NEXT, SMBffirst, SMBsearch, and SMBunique
This commit is contained in:
Steven Danneman 2009-02-02 21:37:51 -08:00
parent 25d345eb39
commit 6272f4c2f4
8 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -6495,6 +6495,7 @@ const char *dptr_ReadDirName(TALLOC_CTX *ctx,
SMB_STRUCT_STAT *pst); SMB_STRUCT_STAT *pst);
bool dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, SMB_STRUCT_STAT *pst); bool dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, SMB_STRUCT_STAT *pst);
void dptr_DirCacheAdd(struct dptr_struct *dptr, const char *name, long offset); void dptr_DirCacheAdd(struct dptr_struct *dptr, const char *name, long offset);
void dptr_init_search_op(struct dptr_struct *dptr);
bool dptr_fill(char *buf1,unsigned int key); bool dptr_fill(char *buf1,unsigned int key);
struct dptr_struct *dptr_fetch(char *buf,int *num); struct dptr_struct *dptr_fetch(char *buf,int *num);
struct dptr_struct *dptr_fetch_lanman2(int dptr_num); struct dptr_struct *dptr_fetch_lanman2(int dptr_num);

4
source3/include/vfs.h
View File

@ -114,6 +114,7 @@
/* Leave at 25 - not yet released. Add create time to ntimes. -- tstecher. */ /* Leave at 25 - not yet released. Add create time to ntimes. -- tstecher. */
/* Leave at 25 - not yet released. Add get_alloc_size call. -- tprouty. */ /* Leave at 25 - not yet released. Add get_alloc_size call. -- tprouty. */
/* Leave at 25 - not yet released. Add SMB_STRUCT_STAT to readdir. - sdann */ /* Leave at 25 - not yet released. Add SMB_STRUCT_STAT to readdir. - sdann */
/* Leave at 25 - not yet released. Add init_search_op call. - sdann */
#define SMB_VFS_INTERFACE_VERSION 25 #define SMB_VFS_INTERFACE_VERSION 25
@ -173,6 +174,7 @@ typedef enum _vfs_op_type {
SMB_VFS_OP_MKDIR, SMB_VFS_OP_MKDIR,
SMB_VFS_OP_RMDIR, SMB_VFS_OP_RMDIR,
SMB_VFS_OP_CLOSEDIR, SMB_VFS_OP_CLOSEDIR,
SMB_VFS_OP_INIT_SEARCH_OP,
/* File operations */ /* File operations */
@ -313,6 +315,7 @@ struct vfs_ops {
int (*mkdir)(struct vfs_handle_struct *handle, const char *path, mode_t mode); int (*mkdir)(struct vfs_handle_struct *handle, const char *path, mode_t mode);
int (*rmdir)(struct vfs_handle_struct *handle, const char *path); int (*rmdir)(struct vfs_handle_struct *handle, const char *path);
int (*closedir)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dir); int (*closedir)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dir);
void (*init_search_op)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
/* File operations */ /* File operations */
@ -484,6 +487,7 @@ struct vfs_ops {
struct vfs_handle_struct *mkdir; struct vfs_handle_struct *mkdir;
struct vfs_handle_struct *rmdir; struct vfs_handle_struct *rmdir;
struct vfs_handle_struct *closedir; struct vfs_handle_struct *closedir;
struct vfs_handle_struct *init_search_op;
/* File operations */ /* File operations */

3
source3/include/vfs_macros.h
View File

@ -45,6 +45,7 @@
#define SMB_VFS_MKDIR(conn, path, mode) ((conn)->vfs.ops.mkdir((conn)->vfs.handles.mkdir,(path), (mode))) #define SMB_VFS_MKDIR(conn, path, mode) ((conn)->vfs.ops.mkdir((conn)->vfs.handles.mkdir,(path), (mode)))
#define SMB_VFS_RMDIR(conn, path) ((conn)->vfs.ops.rmdir((conn)->vfs.handles.rmdir, (path))) #define SMB_VFS_RMDIR(conn, path) ((conn)->vfs.ops.rmdir((conn)->vfs.handles.rmdir, (path)))
#define SMB_VFS_CLOSEDIR(conn, dir) ((conn)->vfs.ops.closedir((conn)->vfs.handles.closedir, dir)) #define SMB_VFS_CLOSEDIR(conn, dir) ((conn)->vfs.ops.closedir((conn)->vfs.handles.closedir, dir))
#define SMB_VFS_INIT_SEARCH_OP(conn, dirp) ((conn)->vfs.ops.init_search_op((conn)->vfs.handles.init_search_op, (dirp)))
/* File operations */ /* File operations */
#define SMB_VFS_OPEN(conn, fname, fsp, flags, mode) (((conn)->vfs.ops.open)((conn)->vfs.handles.open, (fname), (fsp), (flags), (mode))) #define SMB_VFS_OPEN(conn, fname, fsp, flags, mode) (((conn)->vfs.ops.open)((conn)->vfs.handles.open, (fname), (fsp), (flags), (mode)))
@ -173,6 +174,7 @@
#define SMB_VFS_OPAQUE_MKDIR(conn, path, mode) ((conn)->vfs_opaque.ops.mkdir((conn)->vfs_opaque.handles.mkdir,(path), (mode))) #define SMB_VFS_OPAQUE_MKDIR(conn, path, mode) ((conn)->vfs_opaque.ops.mkdir((conn)->vfs_opaque.handles.mkdir,(path), (mode)))
#define SMB_VFS_OPAQUE_RMDIR(conn, path) ((conn)->vfs_opaque.ops.rmdir((conn)->vfs_opaque.handles.rmdir, (path))) #define SMB_VFS_OPAQUE_RMDIR(conn, path) ((conn)->vfs_opaque.ops.rmdir((conn)->vfs_opaque.handles.rmdir, (path)))
#define SMB_VFS_OPAQUE_CLOSEDIR(conn, dir) ((conn)->vfs_opaque.ops.closedir((conn)->vfs_opaque.handles.closedir, dir)) #define SMB_VFS_OPAQUE_CLOSEDIR(conn, dir) ((conn)->vfs_opaque.ops.closedir((conn)->vfs_opaque.handles.closedir, dir))
#define SMB_VFS_OPAQUE_INIT_SEARCH_OP(conn, dirp) ((conn)->vfs_opaque.ops.init_search_op((conn)->vfs_opaque.handles.init_search_op, (dirp)))
/* File operations */ /* File operations */
#define SMB_VFS_OPAQUE_OPEN(conn, fname, fsp, flags, mode) (((conn)->vfs_opaque.ops.open)((conn)->vfs_opaque.handles.open, (fname), (fsp), (flags), (mode))) #define SMB_VFS_OPAQUE_OPEN(conn, fname, fsp, flags, mode) (((conn)->vfs_opaque.ops.open)((conn)->vfs_opaque.handles.open, (fname), (fsp), (flags), (mode)))
@ -302,6 +304,7 @@
#define SMB_VFS_NEXT_MKDIR(handle, path, mode) ((handle)->vfs_next.ops.mkdir((handle)->vfs_next.handles.mkdir,(path), (mode))) #define SMB_VFS_NEXT_MKDIR(handle, path, mode) ((handle)->vfs_next.ops.mkdir((handle)->vfs_next.handles.mkdir,(path), (mode)))
#define SMB_VFS_NEXT_RMDIR(handle, path) ((handle)->vfs_next.ops.rmdir((handle)->vfs_next.handles.rmdir, (path))) #define SMB_VFS_NEXT_RMDIR(handle, path) ((handle)->vfs_next.ops.rmdir((handle)->vfs_next.handles.rmdir, (path)))
#define SMB_VFS_NEXT_CLOSEDIR(handle, dir) ((handle)->vfs_next.ops.closedir((handle)->vfs_next.handles.closedir, dir)) #define SMB_VFS_NEXT_CLOSEDIR(handle, dir) ((handle)->vfs_next.ops.closedir((handle)->vfs_next.handles.closedir, dir))
#define SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp) ((handle)->vfs_next.ops.init_search_op((handle)->vfs_next.handles.init_search_op, (dirp)))
/* File operations */ /* File operations */
#define SMB_VFS_NEXT_OPEN(handle, fname, fsp, flags, mode) (((handle)->vfs_next.ops.open)((handle)->vfs_next.handles.open, (fname), (fsp), (flags), (mode))) #define SMB_VFS_NEXT_OPEN(handle, fname, fsp, flags, mode) (((handle)->vfs_next.ops.open)((handle)->vfs_next.handles.open, (fname), (fsp), (flags), (mode)))

9
source3/modules/vfs_default.c
View File

@ -206,6 +206,13 @@ static int vfswrap_closedir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
return result; return result;
} }
static void vfswrap_init_search_op(vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp)
{
/* Default behavior is a NOOP */
return;
}
/* File operations */ /* File operations */
static int vfswrap_open(vfs_handle_struct *handle, const char *fname, static int vfswrap_open(vfs_handle_struct *handle, const char *fname,
@ -1449,6 +1456,8 @@ static vfs_op_tuple vfs_default_ops[] = {
SMB_VFS_LAYER_OPAQUE}, SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(vfswrap_closedir), SMB_VFS_OP_CLOSEDIR, {SMB_VFS_OP(vfswrap_closedir), SMB_VFS_OP_CLOSEDIR,
SMB_VFS_LAYER_OPAQUE}, SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(vfswrap_init_search_op), SMB_VFS_OP_INIT_SEARCH_OP,
SMB_VFS_LAYER_OPAQUE},
/* File operations */ /* File operations */

14
source3/modules/vfs_full_audit.c
View File

@ -108,6 +108,8 @@ static int smb_full_audit_rmdir(vfs_handle_struct *handle,
const char *path); const char *path);
static int smb_full_audit_closedir(vfs_handle_struct *handle, static int smb_full_audit_closedir(vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp); SMB_STRUCT_DIR *dirp);
static void smb_full_audit_init_search_op(vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp);
static int smb_full_audit_open(vfs_handle_struct *handle, static int smb_full_audit_open(vfs_handle_struct *handle,
const char *fname, files_struct *fsp, int flags, mode_t mode); const char *fname, files_struct *fsp, int flags, mode_t mode);
static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle, static NTSTATUS smb_full_audit_create_file(vfs_handle_struct *handle,
@ -373,6 +375,8 @@ static vfs_op_tuple audit_op_tuples[] = {
SMB_VFS_LAYER_LOGGER}, SMB_VFS_LAYER_LOGGER},
{SMB_VFS_OP(smb_full_audit_closedir), SMB_VFS_OP_CLOSEDIR, {SMB_VFS_OP(smb_full_audit_closedir), SMB_VFS_OP_CLOSEDIR,
SMB_VFS_LAYER_LOGGER}, SMB_VFS_LAYER_LOGGER},
{SMB_VFS_OP(smb_full_audit_init_search_op), SMB_VFS_OP_INIT_SEARCH_OP,
SMB_VFS_LAYER_LOGGER},
/* File operations */ /* File operations */
@ -587,6 +591,7 @@ static struct {
{ SMB_VFS_OP_MKDIR, "mkdir" }, { SMB_VFS_OP_MKDIR, "mkdir" },
{ SMB_VFS_OP_RMDIR, "rmdir" }, { SMB_VFS_OP_RMDIR, "rmdir" },
{ SMB_VFS_OP_CLOSEDIR, "closedir" }, { SMB_VFS_OP_CLOSEDIR, "closedir" },
{ SMB_VFS_OP_INIT_SEARCH_OP, "init_search_op" },
{ SMB_VFS_OP_OPEN, "open" }, { SMB_VFS_OP_OPEN, "open" },
{ SMB_VFS_OP_CREATE_FILE, "create_file" }, { SMB_VFS_OP_CREATE_FILE, "create_file" },
{ SMB_VFS_OP_CLOSE, "close" }, { SMB_VFS_OP_CLOSE, "close" },
@ -1110,6 +1115,15 @@ static int smb_full_audit_closedir(vfs_handle_struct *handle,
return result; return result;
} }
static void smb_full_audit_init_search_op(vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp)
{
SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
do_log(SMB_VFS_OP_INIT_SEARCH_OP, True, handle, "");
return;
}
static int smb_full_audit_open(vfs_handle_struct *handle, static int smb_full_audit_open(vfs_handle_struct *handle,
const char *fname, files_struct *fsp, int flags, mode_t mode) const char *fname, files_struct *fsp, int flags, mode_t mode)
{ {

8
source3/smbd/dir.c
View File

@ -680,6 +680,14 @@ void dptr_DirCacheAdd(struct dptr_struct *dptr, const char *name, long offset)
DirCacheAdd(dptr->dir_hnd, name, offset); DirCacheAdd(dptr->dir_hnd, name, offset);
} }
/****************************************************************************
Initialize variables & state data at the beginning of all search SMB requests.
****************************************************************************/
void dptr_init_search_op(struct dptr_struct *dptr)
{
return SMB_VFS_INIT_SEARCH_OP(dptr->conn, dptr->dir_hnd->dir);
}
/**************************************************************************** /****************************************************************************
Fill the 5 byte server reserved dptr field. Fill the 5 byte server reserved dptr field.
****************************************************************************/ ****************************************************************************/

3
source3/smbd/reply.c
View File

@ -1380,6 +1380,9 @@ void reply_search(struct smb_request *req)
DEBUG(4,("dptr_num is %d\n",dptr_num)); DEBUG(4,("dptr_num is %d\n",dptr_num));
/* Initialize per SMBsearch/SMBffirst/SMBfunique operation data */
dptr_init_search_op(conn->dirptr);
if ((dirtype&0x1F) == aVOLID) { if ((dirtype&0x1F) == aVOLID) {
char buf[DIR_STRUCT_SIZE]; char buf[DIR_STRUCT_SIZE];
memcpy(buf,status,21); memcpy(buf,status,21);

6
source3/smbd/trans2.c
View File

@ -2064,6 +2064,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
dptr_num = dptr_dnum(conn->dirptr); dptr_num = dptr_dnum(conn->dirptr);
DEBUG(4,("dptr_num is %d, wcard = %s, attr = %d\n", dptr_num, mask, dirtype)); DEBUG(4,("dptr_num is %d, wcard = %s, attr = %d\n", dptr_num, mask, dirtype));
/* Initialize per TRANS2_FIND_FIRST operation data */
dptr_init_search_op(conn->dirptr);
/* We don't need to check for VOL here as this is returned by /* We don't need to check for VOL here as this is returned by
a different TRANS2 call. */ a different TRANS2 call. */
@ -2374,6 +2377,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
(long)conn->dirptr, (long)conn->dirptr,
dptr_TellDir(conn->dirptr))); dptr_TellDir(conn->dirptr)));
/* Initialize per TRANS2_FIND_NEXT operation data */
dptr_init_search_op(conn->dirptr);
/* We don't need to check for VOL here as this is returned by /* We don't need to check for VOL here as this is returned by
a different TRANS2 call. */ a different TRANS2 call. */