]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: VFS: vfs_crossrename. Remove rename_fn(). No longer used.
authorJeremy Allison <jra@samba.org>
Fri, 9 Aug 2019 22:59:54 +0000 (15:59 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 16 Aug 2019 19:52:36 +0000 (19:52 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/vfs_crossrename.c

index 95f41e00c9ace047bd818923eb00b398f93fa5f6..4e512655c33f030579c57cf8063507429b0466db 100644 (file)
@@ -167,32 +167,6 @@ static int copy_reg(const char *source, const char *dest)
        return -1;
 }
 
-
-static int crossrename_rename(vfs_handle_struct *handle,
-                         const struct smb_filename *smb_fname_src,
-                         const struct smb_filename *smb_fname_dst)
-{
-       int result = -1;
-
-       START_PROFILE(syscall_rename);
-
-       if (smb_fname_src->stream_name || smb_fname_dst->stream_name) {
-               errno = ENOENT;
-               goto out;
-       }
-
-       result = rename(smb_fname_src->base_name, smb_fname_dst->base_name);
-       if ((result == -1) && (errno == EXDEV)) {
-               /* Rename across filesystems needed. */
-               result = copy_reg(smb_fname_src->base_name,
-                                 smb_fname_dst->base_name);
-       }
-
- out:
-       END_PROFILE(syscall_rename);
-       return result;
-}
-
 static int crossrename_renameat(vfs_handle_struct *handle,
                        files_struct *srcfsp,
                        const struct smb_filename *smb_fname_src,
@@ -223,7 +197,6 @@ static int crossrename_renameat(vfs_handle_struct *handle,
 
 static struct vfs_fn_pointers vfs_crossrename_fns = {
        .connect_fn = crossrename_connect,
-       .rename_fn = crossrename_rename,
        .renameat_fn = crossrename_renameat
 };