From f1f2e09b1947b31c9c5800db94198556e1d2a47a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 May 2011 13:41:57 -0700 Subject: [PATCH] --- yaml --- r: 252708 b: refs/heads/master c: 44a8e6364e48ab93a1d86385b5fc9efe81395fa9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jfs/namei.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a2b4ad82bcbd..05aed579acb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf0f0536fa65ca1353476c49feed34891f3f7134 +refs/heads/master: 44a8e6364e48ab93a1d86385b5fc9efe81395fa9 diff --git a/trunk/fs/jfs/namei.c b/trunk/fs/jfs/namei.c index 865df16a6cf3..eaaf2b511e89 100644 --- a/trunk/fs/jfs/namei.c +++ b/trunk/fs/jfs/namei.c @@ -360,8 +360,6 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry) jfs_info("jfs_rmdir: dip:0x%p name:%s", dip, dentry->d_name.name); - dentry_unhash(dentry); - /* Init inode for quota operations. */ dquot_initialize(dip); dquot_initialize(ip); @@ -1097,9 +1095,6 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry, jfs_info("jfs_rename: %s %s", old_dentry->d_name.name, new_dentry->d_name.name); - 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);