From d080085273f8c723dd1a844743904cf1cd9822a1 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 9 Aug 2019 16:08:53 -0700 Subject: [PATCH] s3: VFS: vfs_shadow_copy2. Remove rename_fn(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/modules/vfs_shadow_copy2.c | 44 ------------------------------ 1 file changed, 44 deletions(-) diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c index 8ab4a6c743a..5d57b9c0229 100644 --- a/source3/modules/vfs_shadow_copy2.c +++ b/source3/modules/vfs_shadow_copy2.c @@ -1135,49 +1135,6 @@ static DIR *shadow_copy2_opendir(vfs_handle_struct *handle, return ret; } -static int shadow_copy2_rename(vfs_handle_struct *handle, - const struct smb_filename *smb_fname_src, - const struct smb_filename *smb_fname_dst) -{ - time_t timestamp_src = 0; - time_t timestamp_dst = 0; - char *snappath_src = NULL; - char *snappath_dst = NULL; - - if (!shadow_copy2_strip_snapshot_internal(talloc_tos(), handle, - smb_fname_src->base_name, - ×tamp_src, NULL, &snappath_src, - NULL)) { - return -1; - } - if (!shadow_copy2_strip_snapshot_internal(talloc_tos(), handle, - smb_fname_dst->base_name, - ×tamp_dst, NULL, &snappath_dst, - NULL)) { - return -1; - } - if (timestamp_src != 0) { - errno = EXDEV; - return -1; - } - if (timestamp_dst != 0) { - errno = EROFS; - return -1; - } - /* - * Don't allow rename on already converted paths. - */ - if (snappath_src != NULL) { - errno = EXDEV; - return -1; - } - if (snappath_dst != NULL) { - errno = EROFS; - return -1; - } - return SMB_VFS_NEXT_RENAME(handle, smb_fname_src, smb_fname_dst); -} - static int shadow_copy2_renameat(vfs_handle_struct *handle, files_struct *srcfsp, const struct smb_filename *smb_fname_src, @@ -3172,7 +3129,6 @@ static struct vfs_fn_pointers vfs_shadow_copy2_fns = { .opendir_fn = shadow_copy2_opendir, .disk_free_fn = shadow_copy2_disk_free, .get_quota_fn = shadow_copy2_get_quota, - .rename_fn = shadow_copy2_rename, .renameat_fn = shadow_copy2_renameat, .link_fn = shadow_copy2_link, .symlink_fn = shadow_copy2_symlink, -- 2.47.3