diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-24 13:06:15 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 07:26:54 -0400 |
| commit | f64f58f85403a5a8a21f1fbbc7798e56580785cf (patch) | |
| tree | 93fbbe1271a4f6499b1041cb570c80934f3abb3c /fs | |
| parent | 051e8f0ee23c9ca963e2a0208153c6cd475f05fb (diff) | |
| download | linux-3.10-f64f58f85403a5a8a21f1fbbc7798e56580785cf.tar.gz linux-3.10-f64f58f85403a5a8a21f1fbbc7798e56580785cf.tar.bz2 linux-3.10-f64f58f85403a5a8a21f1fbbc7798e56580785cf.zip | |
btrfs: remove unnecessary dentry_unhash in rmdir/rename_dir
Btrfs has no problems with lingering references to unlinked directory
inodes.
CC: Chris Mason <chris.mason@oracle.com>
CC: linux-btrfs@vger.kernel.org
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3a33ae3ace5..7cd8ab0ef04 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) inode->i_ino == BTRFS_FIRST_FREE_OBJECTID) return -ENOTEMPTY; - dentry_unhash(dentry); - trans = __unlink_start_trans(dir, dentry); if (IS_ERR(trans)) return PTR_ERR(trans); @@ -6994,9 +6992,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, u64 root_objectid; int ret; - if (new_inode && S_ISDIR(new_dentry->d_inode->i_mode)) - dentry_unhash(new_dentry); - if (new_dir->i_ino == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) return -EPERM; |