From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 20:06:20 +0000 (-0700)
Subject: exofs: remove unnecessary dentry_unhash on rmdir/rename_dir
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8cbfa53b1cd08ae3b315bbb55f7396f5a6a6a4f7;p=openwrt%2Fstaging%2Fblogic.git

exofs: remove unnecessary dentry_unhash on rmdir/rename_dir

Exofs has no problems with lingering references to unlinked directory
inodes.

CC: Benny Halevy <bhalevy@panasas.com>
CC: osd-dev@open-osd.org
Acked-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/exofs/namei.c b/fs/exofs/namei.c
index de252e5acf05..4d70db110cfc 100644
--- a/fs/exofs/namei.c
+++ b/fs/exofs/namei.c
@@ -227,8 +227,6 @@ static int exofs_rmdir(struct inode *dir, struct dentry *dentry)
 	struct inode *inode = dentry->d_inode;
 	int err = -ENOTEMPTY;
 
-	dentry_unhash(dentry);
-
 	if (exofs_empty_dir(inode)) {
 		err = exofs_unlink(dir, dentry);
 		if (!err) {
@@ -251,9 +249,6 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct exofs_dir_entry *old_de;
 	int err = -ENOENT;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	old_de = exofs_find_entry(old_dir, old_dentry, &old_page);
 	if (!old_de)
 		goto out;