diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-24 16:06:15 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 07:26:54 -0400 |
| commit | f64f58f85403a5a8a21f1fbbc7798e56580785cf (patch) | |
| tree | 93fbbe1271a4f6499b1041cb570c80934f3abb3c | |
| parent | 051e8f0ee23c9ca963e2a0208153c6cd475f05fb (diff) | |
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>
| -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 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 | ||