summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 20:06:18 (GMT)
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 11:26:56 (GMT)
commit5afcb940fa37f57d124155f30a1a8d7794a476e0 (patch)
tree1205e0719b8f20e66b340e08a3ce612abfc96486 /fs
parent5a61a245f7489feec865264e2627c5071aef8c66 (diff)
downloadlinux-5afcb940fa37f57d124155f30a1a8d7794a476e0.tar.xz
ext2: remove unnecessary dentry_unhash on rmdir/rename_dir
ext2 has no problems with lingering references to unlinked directory inodes. CC: Jan Kara <jack@suse.cz> CC: linux-ext4@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/ext2/namei.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 516c31d..ed5c5d4 100644
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -296,8 +296,6 @@ static int ext2_rmdir (struct inode * dir, struct dentry *dentry)
struct inode * inode = dentry->d_inode;
int err = -ENOTEMPTY;
- dentry_unhash(dentry);
-
if (ext2_empty_dir(inode)) {
err = ext2_unlink(dir, dentry);
if (!err) {
@@ -320,9 +318,6 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
struct ext2_dir_entry_2 * old_de;
int err = -ENOENT;
- if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
- dentry_unhash(new_dentry);
-
dquot_initialize(old_dir);
dquot_initialize(new_dir);