aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 16:06:17 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:55 -0400
commit5a61a245f7489feec865264e2627c5071aef8c66 (patch)
tree5feabe1d0cb22310221a72cfd0f882456383fc4e
parent40ebc0af58a88652c9a9c1e9126c8fcf9fce1f6e (diff)
ext3: remove unnecessary dentry_unhash on rmdir/rename_dir
ext3 has no problems with lingering references to unlinked directory inodes. CC: Jan Kara <jack@suse.cz> CC: Andrew Morton <akpm@linux-foundation.org> 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/ext3/namei.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index f89b1d4c2fb5..32f3b8695859 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -2074,8 +2074,6 @@ static int ext3_rmdir (struct inode * dir, struct dentry *dentry)
2074 struct ext3_dir_entry_2 * de; 2074 struct ext3_dir_entry_2 * de;
2075 handle_t *handle; 2075 handle_t *handle;
2076 2076
2077 dentry_unhash(dentry);
2078
2079 /* Initialize quotas before so that eventual writes go in 2077 /* Initialize quotas before so that eventual writes go in
2080 * separate transaction */ 2078 * separate transaction */
2081 dquot_initialize(dir); 2079 dquot_initialize(dir);
@@ -2298,9 +2296,6 @@ static int ext3_rename (struct inode * old_dir, struct dentry *old_dentry,
2298 struct ext3_dir_entry_2 * old_de, * new_de; 2296 struct ext3_dir_entry_2 * old_de, * new_de;
2299 int retval, flush_file = 0; 2297 int retval, flush_file = 0;
2300 2298
2301 if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
2302 dentry_unhash(new_dentry);
2303
2304 dquot_initialize(old_dir); 2299 dquot_initialize(old_dir);
2305 dquot_initialize(new_dir); 2300 dquot_initialize(new_dir);
2306 2301