]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: VFS: vfs_xattr_tdb: Remove unlink_fn. No longer used.
authorJeremy Allison <jra@samba.org>
Wed, 18 Sep 2019 02:16:31 +0000 (19:16 -0700)
committerRalph Boehme <slow@samba.org>
Thu, 26 Sep 2019 17:20:51 +0000 (17:20 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/vfs_xattr_tdb.c

index 588a2740d685c282df0793df90112568c6b22cdd..1d97770e0b6fcee54b49eb52ad298c0b13d5be22 100644 (file)
@@ -590,65 +590,6 @@ static int xattr_tdb_mkdirat(vfs_handle_struct *handle,
        return 0;
 }
 
-/*
- * On unlink we need to delete the tdb record
- */
-static int xattr_tdb_unlink(vfs_handle_struct *handle,
-                           const struct smb_filename *smb_fname)
-{
-       struct smb_filename *smb_fname_tmp = NULL;
-       struct file_id id;
-       struct db_context *db;
-       int ret = -1;
-       bool remove_record = false;
-       TALLOC_CTX *frame = talloc_stackframe();
-
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
-                               if (!xattr_tdb_init(-1, frame, &db))
-                               {
-                                       TALLOC_FREE(frame); return -1;
-                               });
-
-       smb_fname_tmp = cp_smb_filename(frame, smb_fname);
-       if (smb_fname_tmp == NULL) {
-               TALLOC_FREE(frame);
-               errno = ENOMEM;
-               return -1;
-       }
-
-       if (smb_fname_tmp->flags & SMB_FILENAME_POSIX_PATH) {
-               ret = SMB_VFS_NEXT_LSTAT(handle, smb_fname_tmp);
-       } else {
-               ret = SMB_VFS_NEXT_STAT(handle, smb_fname_tmp);
-       }
-       if (ret == -1) {
-               goto out;
-       }
-
-       if (smb_fname_tmp->st.st_ex_nlink == 1) {
-               /* Only remove record on last link to file. */
-               remove_record = true;
-       }
-
-       ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname_tmp);
-
-       if (ret == -1) {
-               goto out;
-       }
-
-       if (!remove_record) {
-               goto out;
-       }
-
-       id = SMB_VFS_NEXT_FILE_ID_CREATE(handle, &smb_fname_tmp->st);
-
-       xattr_tdb_remove_all_attrs(db, &id);
-
- out:
-       TALLOC_FREE(frame);
-       return ret;
-}
-
 /*
  * On unlink we need to delete the tdb record
  */
@@ -815,7 +756,6 @@ static struct vfs_fn_pointers vfs_xattr_tdb_fns = {
        .fremovexattr_fn = xattr_tdb_fremovexattr,
        .open_fn = xattr_tdb_open,
        .mkdirat_fn = xattr_tdb_mkdirat,
-       .unlink_fn = xattr_tdb_unlink,
        .unlinkat_fn = xattr_tdb_unlinkat,
        .rmdir_fn = xattr_tdb_rmdir,
        .connect_fn = xattr_tdb_connect,