From c758cdbe0742706878e3faa35a8755122dd4c818 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 24 May 2011 13:06:16 -0700 Subject: [PATCH] --- yaml --- r: 251696 b: refs/heads/master c: 40ebc0af58a88652c9a9c1e9126c8fcf9fce1f6e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/namei.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 85795a2888df..4d9af0edcaf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f64f58f85403a5a8a21f1fbbc7798e56580785cf +refs/heads/master: 40ebc0af58a88652c9a9c1e9126c8fcf9fce1f6e diff --git a/trunk/fs/ext4/namei.c b/trunk/fs/ext4/namei.c index 792d06e811c1..67fd0b025858 100644 --- a/trunk/fs/ext4/namei.c +++ b/trunk/fs/ext4/namei.c @@ -2123,8 +2123,6 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry) struct ext4_dir_entry_2 *de; handle_t *handle; - dentry_unhash(dentry); - /* Initialize quotas before so that eventual writes go in * separate transaction */ dquot_initialize(dir); @@ -2352,9 +2350,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, struct ext4_dir_entry_2 *old_de, *new_de; int retval, force_da_alloc = 0; - 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);