From: Jeremy Allison Date: Fri, 4 Oct 2019 22:23:44 +0000 (-0700) Subject: s3: VFS: vfs_time_audit: Remove rmdir_fn(). No longer used. X-Git-Tag: talloc-2.3.1~396 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bf96b1f0b61847771aab7be35121a1d5c15554e;p=thirdparty%2Fsamba.git s3: VFS: vfs_time_audit: Remove rmdir_fn(). No longer used. NB, this will now fail smb_vfs_assert_all_fns() until we remove the rmdir_fn() from the VFS definitions. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 757cd26d3f1..3c337a2e62b 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -111,7 +111,6 @@ typedef enum _vfs_op_type { SMB_VFS_OP_TELLDIR, SMB_VFS_OP_REWINDDIR, SMB_VFS_OP_MKDIRAT, - SMB_VFS_OP_RMDIR, SMB_VFS_OP_CLOSEDIR, /* File operations */ @@ -258,7 +257,6 @@ static struct { { SMB_VFS_OP_TELLDIR, "telldir" }, { SMB_VFS_OP_REWINDDIR, "rewinddir" }, { SMB_VFS_OP_MKDIRAT, "mkdirat" }, - { SMB_VFS_OP_RMDIR, "rmdir" }, { SMB_VFS_OP_CLOSEDIR, "closedir" }, { SMB_VFS_OP_OPEN, "open" }, { SMB_VFS_OP_CREATE_FILE, "create_file" }, @@ -1030,22 +1028,6 @@ static int smb_full_audit_mkdirat(vfs_handle_struct *handle, return result; } -static int smb_full_audit_rmdir(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ - int result; - - result = SMB_VFS_NEXT_RMDIR(handle, smb_fname); - - do_log(SMB_VFS_OP_RMDIR, - (result >= 0), - handle, - "%s", - smb_fname_str_do_log(handle->conn, smb_fname)); - - return result; -} - static int smb_full_audit_closedir(vfs_handle_struct *handle, DIR *dirp) { @@ -2967,7 +2949,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = { .telldir_fn = smb_full_audit_telldir, .rewind_dir_fn = smb_full_audit_rewinddir, .mkdirat_fn = smb_full_audit_mkdirat, - .rmdir_fn = smb_full_audit_rmdir, .closedir_fn = smb_full_audit_closedir, .open_fn = smb_full_audit_open, .create_file_fn = smb_full_audit_create_file,