vfs: remove SMB_VFS_INIT_SEARCH_OP

This VFS is no longer being called, hence removed.

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

5 files changed, 2 insertions, 34 deletions

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index d71d7cc4483..7372440d38a 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -244,8 +244,9 @@
 /* Version 37 - Remove SMB_VFS_STRICT_UNLOCK */
 /* Version 37 - Rename SMB_VFS_STRICT_LOCK to
                 SMB_VFS_STRICT_LOCK_CHECK */
+/* Version 38 - Remove SMB_VFS_INIT_SEARCH_OP */
 
-#define SMB_VFS_INTERFACE_VERSION 37
+#define SMB_VFS_INTERFACE_VERSION 38
 
 /*
     All intercepted VFS operations must be declared as static functions inside module source
@@ -656,7 +657,6 @@ struct vfs_fn_pointers {
 	int (*rmdir_fn)(struct vfs_handle_struct *handle,
 			const struct smb_filename *smb_fname);
 	int (*closedir_fn)(struct vfs_handle_struct *handle, DIR *dir);
-	void (*init_search_op_fn)(struct vfs_handle_struct *handle, DIR *dirp);
 
 	/* File operations */
 
@@ -1145,8 +1145,6 @@ int smb_vfs_call_rmdir(struct vfs_handle_struct *handle,
 			const struct smb_filename *smb_fname);
 int smb_vfs_call_closedir(struct vfs_handle_struct *handle,
 			  DIR *dir);
-void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,
-				 DIR *dirp);
 int smb_vfs_call_open(struct vfs_handle_struct *handle,
 		      struct smb_filename *smb_fname, struct files_struct *fsp,
 		      int flags, mode_t mode);
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 3cce1925ca1..dcf788e743b 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -124,11 +124,6 @@
 #define SMB_VFS_NEXT_CLOSEDIR(handle, dir) \
 	smb_vfs_call_closedir((handle)->next, (dir))
 
-#define SMB_VFS_INIT_SEARCH_OP(conn, dirp) \
-	smb_vfs_call_init_search_op((conn)->vfs_handles, (dirp))
-#define SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp) \
-	smb_vfs_call_init_search_op((handle)->next, (dirp))
-
 /* File operations */
 #define SMB_VFS_OPEN(conn, fname, fsp, flags, mode) \
 	smb_vfs_call_open((conn)->vfs_handles, (fname), (fsp), (flags), (mode))
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 53d97859ec3..3379493accb 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -554,12 +554,6 @@ static int vfswrap_closedir(vfs_handle_struct *handle, DIR *dirp)
 	return result;
 }
 
-static void vfswrap_init_search_op(vfs_handle_struct *handle,
-				   DIR *dirp)
-{
-	/* Default behavior is a NOOP */
-}
-
 /* File operations */
 
 static int vfswrap_open(vfs_handle_struct *handle,
@@ -3052,7 +3046,6 @@ static struct vfs_fn_pointers vfs_default_fns = {
 	.mkdir_fn = vfswrap_mkdir,
 	.rmdir_fn = vfswrap_rmdir,
 	.closedir_fn = vfswrap_closedir,
-	.init_search_op_fn = vfswrap_init_search_op,
 
 	/* File operations */
 
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index a205007f46f..b8471593db7 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -110,7 +110,6 @@ typedef enum _vfs_op_type {
 	SMB_VFS_OP_MKDIR,
 	SMB_VFS_OP_RMDIR,
 	SMB_VFS_OP_CLOSEDIR,
-	SMB_VFS_OP_INIT_SEARCH_OP,
 
 	/* File operations */
 
@@ -256,7 +255,6 @@ static struct {
 	{ SMB_VFS_OP_MKDIR,	"mkdir" },
 	{ SMB_VFS_OP_RMDIR,	"rmdir" },
 	{ SMB_VFS_OP_CLOSEDIR,	"closedir" },
-	{ SMB_VFS_OP_INIT_SEARCH_OP, "init_search_op" },
 	{ SMB_VFS_OP_OPEN,	"open" },
 	{ SMB_VFS_OP_CREATE_FILE, "create_file" },
 	{ SMB_VFS_OP_CLOSE,	"close" },
@@ -930,14 +928,6 @@ static int smb_full_audit_closedir(vfs_handle_struct *handle,
 	return result;
 }
 
-static void smb_full_audit_init_search_op(vfs_handle_struct *handle,
-			DIR *dirp)
-{
-	SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
-
-	do_log(SMB_VFS_OP_INIT_SEARCH_OP, True, handle, "");
-}
-
 static int smb_full_audit_open(vfs_handle_struct *handle,
 			       struct smb_filename *smb_fname,
 			       files_struct *fsp, int flags, mode_t mode)
@@ -2516,7 +2506,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
 	.mkdir_fn = smb_full_audit_mkdir,
 	.rmdir_fn = smb_full_audit_rmdir,
 	.closedir_fn = smb_full_audit_closedir,
-	.init_search_op_fn = smb_full_audit_init_search_op,
 	.open_fn = smb_full_audit_open,
 	.create_file_fn = smb_full_audit_create_file,
 	.close_fn = smb_full_audit_close,
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index d4fccb7eda9..59702203612 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1685,13 +1685,6 @@ int smb_vfs_call_closedir(struct vfs_handle_struct *handle,
 	return handle->fns->closedir_fn(handle, dir);
 }
 
-void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,
-				 DIR *dirp)
-{
-	VFS_FIND(init_search_op);
-	handle->fns->init_search_op_fn(handle, dirp);
-}
-
 int smb_vfs_call_open(struct vfs_handle_struct *handle,
 		      struct smb_filename *smb_fname, struct files_struct *fsp,
 		      int flags, mode_t mode)