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

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

diff --git a/[refs] b/[refs]
index 8984a92cfeda..c701ff7cb848 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b80d2c228d8206cadc32226750dbbf3b707bdd19
+refs/heads/master: 45adfef7d023004ff95bf63b5f2f0e2d88afac3f
diff --git a/trunk/fs/hpfs/namei.c b/trunk/fs/hpfs/namei.c
index ff0ce21c0867..acf95dab2aac 100644
--- a/trunk/fs/hpfs/namei.c
+++ b/trunk/fs/hpfs/namei.c
@@ -439,8 +439,6 @@ static int hpfs_rmdir(struct inode *dir, struct dentry *dentry)
 	int err;
 	int r;
 
-	dentry_unhash(dentry);
-
 	hpfs_adjust_length(name, &len);
 	hpfs_lock(dir->i_sb);
 	err = -ENOENT;
@@ -535,9 +533,6 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct fnode *fnode;
 	int err;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	if ((err = hpfs_chk_name(new_name, &new_len))) return err;
 	err = 0;
 	hpfs_adjust_length(old_name, &old_len);