From 66fa88682199101478689ce58e5b5cbf01044f8f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 24 May 2011 13:06:20 -0700
Subject: [PATCH] --- yaml --- r: 251700 b: refs/heads/master c:
 8cbfa53b1cd08ae3b315bbb55f7396f5a6a6a4f7 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/exofs/namei.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 82c29f777d7d..5e2bc5f68f48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 052e2a1ba2d07e724ae9cc0608389292276cb77a
+refs/heads/master: 8cbfa53b1cd08ae3b315bbb55f7396f5a6a6a4f7
diff --git a/trunk/fs/exofs/namei.c b/trunk/fs/exofs/namei.c
index de252e5acf05..4d70db110cfc 100644
--- a/trunk/fs/exofs/namei.c
+++ b/trunk/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;