From 86e996b2f03ebf3152bda43f9eb4b960d9c47d62 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 27 May 2011 13:41:55 -0700
Subject: [PATCH] --- yaml --- r: 252706 b: refs/heads/master c:
 873ae4d5a8b282c6e2bbc09c6d59eeb1bec97ef7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2a57f571111c..e53f13031b04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76f0b8d2d2c8d417623142069cdfde1cf1e108d5
+refs/heads/master: 873ae4d5a8b282c6e2bbc09c6d59eeb1bec97ef7
diff --git a/trunk/fs/sysv/namei.c b/trunk/fs/sysv/namei.c
index e2cc6756f3b1..e474fbcf8bde 100644
--- a/trunk/fs/sysv/namei.c
+++ b/trunk/fs/sysv/namei.c
@@ -196,8 +196,6 @@ static int sysv_rmdir(struct inode * dir, struct dentry * dentry)
 	struct inode *inode = dentry->d_inode;
 	int err = -ENOTEMPTY;
 
-	dentry_unhash(dentry);
-
 	if (sysv_empty_dir(inode)) {
 		err = sysv_unlink(dir, dentry);
 		if (!err) {
@@ -224,9 +222,6 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry,
 	struct sysv_dir_entry * old_de;
 	int err = -ENOENT;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	old_de = sysv_find_entry(old_dentry, &old_page);
 	if (!old_de)
 		goto out;