From 9d708bc54775aa39278eee3edda127ac89f3797a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 27 May 2011 13:42:13 -0700
Subject: [PATCH] --- yaml --- r: 252724 b: refs/heads/master c:
 705da2de95ce79199a52f21d82dd9f36b89afd12 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 74797088fa5a..99b3ab08154d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94f9901b6c05d5e1e38d887179b8307efbc8e10c
+refs/heads/master: 705da2de95ce79199a52f21d82dd9f36b89afd12
diff --git a/trunk/fs/afs/dir.c b/trunk/fs/afs/dir.c
index 2c4e05160042..20c106f24927 100644
--- a/trunk/fs/afs/dir.c
+++ b/trunk/fs/afs/dir.c
@@ -845,8 +845,6 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry)
 	_enter("{%x:%u},{%s}",
 	       dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name);
 
-	dentry_unhash(dentry);
-
 	ret = -ENAMETOOLONG;
 	if (dentry->d_name.len >= AFSNAMEMAX)
 		goto error;
@@ -1148,9 +1146,6 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct key *key;
 	int ret;
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	vnode = AFS_FS_I(old_dentry->d_inode);
 	orig_dvnode = AFS_FS_I(old_dir);
 	new_dvnode = AFS_FS_I(new_dir);