From 7aadbe5608e0322fbb627b4da4382613fa9dd25d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 9 Aug 2019 16:04:35 -0700 Subject: [PATCH] s3: VFS: vfs_full_audit. Remove rename_fn(). No longer used. NB, this will now fail smb_vfs_assert_all_fns() until we remove the rename_fn() from the VFS definitions. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/modules/vfs_full_audit.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index fd01d23b202..e9e9e132b0a 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -128,7 +128,6 @@ typedef enum _vfs_op_type { SMB_VFS_OP_LSEEK, SMB_VFS_OP_SENDFILE, SMB_VFS_OP_RECVFILE, - SMB_VFS_OP_RENAME, SMB_VFS_OP_RENAMEAT, SMB_VFS_OP_FSYNC, SMB_VFS_OP_FSYNC_SEND, @@ -272,7 +271,6 @@ static struct { { SMB_VFS_OP_LSEEK, "lseek" }, { SMB_VFS_OP_SENDFILE, "sendfile" }, { SMB_VFS_OP_RECVFILE, "recvfile" }, - { SMB_VFS_OP_RENAME, "rename" }, { SMB_VFS_OP_RENAMEAT, "renameat" }, { SMB_VFS_OP_FSYNC, "fsync" }, { SMB_VFS_OP_FSYNC_SEND, "fsync_send" }, @@ -1351,21 +1349,6 @@ static ssize_t smb_full_audit_recvfile(vfs_handle_struct *handle, int fromfd, return result; } -static int smb_full_audit_rename(vfs_handle_struct *handle, - const struct smb_filename *smb_fname_src, - const struct smb_filename *smb_fname_dst) -{ - int result; - - result = SMB_VFS_NEXT_RENAME(handle, smb_fname_src, smb_fname_dst); - - do_log(SMB_VFS_OP_RENAME, (result >= 0), handle, "%s|%s", - smb_fname_str_do_log(handle->conn, smb_fname_src), - smb_fname_str_do_log(handle->conn, smb_fname_dst)); - - return result; -} - static int smb_full_audit_renameat(vfs_handle_struct *handle, files_struct *srcfsp, const struct smb_filename *smb_fname_src, @@ -2869,7 +2852,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = { .lseek_fn = smb_full_audit_lseek, .sendfile_fn = smb_full_audit_sendfile, .recvfile_fn = smb_full_audit_recvfile, - .rename_fn = smb_full_audit_rename, .renameat_fn = smb_full_audit_renameat, .fsync_send_fn = smb_full_audit_fsync_send, .fsync_recv_fn = smb_full_audit_fsync_recv, -- 2.47.2