]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: VFS: vfs_fruit. Remove rename_fn(). No longer used.
authorJeremy Allison <jra@samba.org>
Fri, 9 Aug 2019 23:03:11 +0000 (16:03 -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_fruit.c

index b81dfe2988f12f2f353702e0ff592f5440587929..30dbf8af27a59793e03d813b75038fc2cd20a2f3 100644 (file)
@@ -1698,60 +1698,6 @@ static int fruit_close(vfs_handle_struct *handle,
        return ret;
 }
 
-static int fruit_rename(struct vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname_src,
-                       const struct smb_filename *smb_fname_dst)
-{
-       int rc = -1;
-       struct fruit_config_data *config = NULL;
-       struct smb_filename *src_adp_smb_fname = NULL;
-       struct smb_filename *dst_adp_smb_fname = NULL;
-
-       SMB_VFS_HANDLE_GET_DATA(handle, config,
-                               struct fruit_config_data, return -1);
-
-       if (!VALID_STAT(smb_fname_src->st)) {
-               DBG_ERR("Need valid stat for [%s]\n",
-                       smb_fname_str_dbg(smb_fname_src));
-               return -1;
-       }
-
-       rc = SMB_VFS_NEXT_RENAME(handle, smb_fname_src, smb_fname_dst);
-       if (rc != 0) {
-               return -1;
-       }
-
-       if ((config->rsrc != FRUIT_RSRC_ADFILE) ||
-           (!S_ISREG(smb_fname_src->st.st_ex_mode)))
-       {
-               return 0;
-       }
-
-       rc = adouble_path(talloc_tos(), smb_fname_src, &src_adp_smb_fname);
-       if (rc != 0) {
-               goto done;
-       }
-
-       rc = adouble_path(talloc_tos(), smb_fname_dst, &dst_adp_smb_fname);
-       if (rc != 0) {
-               goto done;
-       }
-
-       DBG_DEBUG("%s -> %s\n",
-                 smb_fname_str_dbg(src_adp_smb_fname),
-                 smb_fname_str_dbg(dst_adp_smb_fname));
-
-       rc = SMB_VFS_NEXT_RENAME(handle, src_adp_smb_fname, dst_adp_smb_fname);
-       if (errno == ENOENT) {
-               rc = 0;
-       }
-
-done:
-       TALLOC_FREE(src_adp_smb_fname);
-       TALLOC_FREE(dst_adp_smb_fname);
-       return rc;
-}
-
 static int fruit_renameat(struct vfs_handle_struct *handle,
                        files_struct *srcfsp,
                        const struct smb_filename *smb_fname_src,
@@ -5119,7 +5065,6 @@ static struct vfs_fn_pointers vfs_fruit_fns = {
        .chmod_fn = fruit_chmod,
        .chown_fn = fruit_chown,
        .unlink_fn = fruit_unlink,
-       .rename_fn = fruit_rename,
        .renameat_fn = fruit_renameat,
        .rmdir_fn = fruit_rmdir,
        .open_fn = fruit_open,