diff options
author | Sage Weil <sage@newdream.net> | 2011-05-24 16:06:16 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 07:26:55 -0400 |
commit | 40ebc0af58a88652c9a9c1e9126c8fcf9fce1f6e (patch) | |
tree | 1caabdb25768f3750005da954868a8db2a31a3af | |
parent | f64f58f85403a5a8a21f1fbbc7798e56580785cf (diff) |
ext4: remove unnecessary dentry_unhash on rmdir/rename_dir
ext4 has no problems with lingering references to unlinked directory
inodes.
CC: "Theodore Ts'o" <tytso@mit.edu>
CC: Andreas Dilger <adilger.kernel@dilger.ca>
CC: linux-ext4@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/ext4/namei.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 792d06e811c1..67fd0b025858 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
@@ -2123,8 +2123,6 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry) | |||
2123 | struct ext4_dir_entry_2 *de; | 2123 | struct ext4_dir_entry_2 *de; |
2124 | handle_t *handle; | 2124 | handle_t *handle; |
2125 | 2125 | ||
2126 | dentry_unhash(dentry); | ||
2127 | |||
2128 | /* Initialize quotas before so that eventual writes go in | 2126 | /* Initialize quotas before so that eventual writes go in |
2129 | * separate transaction */ | 2127 | * separate transaction */ |
2130 | dquot_initialize(dir); | 2128 | dquot_initialize(dir); |
@@ -2352,9 +2350,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
2352 | struct ext4_dir_entry_2 *old_de, *new_de; | 2350 | struct ext4_dir_entry_2 *old_de, *new_de; |
2353 | int retval, force_da_alloc = 0; | 2351 | int retval, force_da_alloc = 0; |
2354 | 2352 | ||
2355 | if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) | ||
2356 | dentry_unhash(new_dentry); | ||
2357 | |||
2358 | dquot_initialize(old_dir); | 2353 | dquot_initialize(old_dir); |
2359 | dquot_initialize(new_dir); | 2354 | dquot_initialize(new_dir); |
2360 | 2355 | ||