aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/btrfs/inode.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 3a33ae3ace5b..7cd8ab0ef04d 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3062,8 +3062,6 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
3062 inode->i_ino == BTRFS_FIRST_FREE_OBJECTID) 3062 inode->i_ino == BTRFS_FIRST_FREE_OBJECTID)
3063 return -ENOTEMPTY; 3063 return -ENOTEMPTY;
3064 3064
3065 dentry_unhash(dentry);
3066
3067 trans = __unlink_start_trans(dir, dentry); 3065 trans = __unlink_start_trans(dir, dentry);
3068 if (IS_ERR(trans)) 3066 if (IS_ERR(trans))
3069 return PTR_ERR(trans); 3067 return PTR_ERR(trans);
@@ -6994,9 +6992,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
6994 u64 root_objectid; 6992 u64 root_objectid;
6995 int ret; 6993 int ret;
6996 6994
6997 if (new_inode && S_ISDIR(new_dentry->d_inode->i_mode))
6998 dentry_unhash(new_dentry);
6999
7000 if (new_dir->i_ino == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) 6995 if (new_dir->i_ino == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)
7001 return -EPERM; 6996 return -EPERM;
7002 6997