From 85d54d83b57f2f20ac91fbe66e043fd8fd670ebd Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 27 May 2011 13:42:14 -0700
Subject: [PATCH] --- yaml --- r: 252725 b: refs/heads/master c:
 42b850b2806f8f55f5c3a0e3c78af738d5054fdc h: refs/heads/master i:   252723:
 cf3f9a01a60f9b3ee04adae1eb9176d44b17fa32 v: v3

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

diff --git a/[refs] b/[refs]
index 99b3ab08154d..dc6c8c0d7eeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 705da2de95ce79199a52f21d82dd9f36b89afd12
+refs/heads/master: 42b850b2806f8f55f5c3a0e3c78af738d5054fdc
diff --git a/trunk/fs/coda/dir.c b/trunk/fs/coda/dir.c
index a46126fd5735..2b8dae4d121e 100644
--- a/trunk/fs/coda/dir.c
+++ b/trunk/fs/coda/dir.c
@@ -336,8 +336,6 @@ static int coda_rmdir(struct inode *dir, struct dentry *de)
 	int len = de->d_name.len;
 	int error;
 
-	dentry_unhash(de);
-
 	error = venus_rmdir(dir->i_sb, coda_i2f(dir), name, len);
 	if (!error) {
 		/* VFS may delete the child */
@@ -361,9 +359,6 @@ static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
 	int new_length = new_dentry->d_name.len;
 	int error;
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	error = venus_rename(old_dir->i_sb, coda_i2f(old_dir),
 			     coda_i2f(new_dir), old_length, new_length,
 			     (const char *) old_name, (const char *)new_name);