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

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

diff --git a/[refs] b/[refs]
index cd49b2834579..fd9c6c14dc18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06
+refs/heads/master: 87161faae26503a8ebe1be5ba72073ae860dbfc7
diff --git a/trunk/fs/ufs/namei.c b/trunk/fs/ufs/namei.c
index 953ebdfc5bf7..29309e25417f 100644
--- a/trunk/fs/ufs/namei.c
+++ b/trunk/fs/ufs/namei.c
@@ -258,8 +258,6 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
 	struct inode * inode = dentry->d_inode;
 	int err= -ENOTEMPTY;
 
-	dentry_unhash(dentry);
-
 	lock_ufs(dir->i_sb);
 	if (ufs_empty_dir (inode)) {
 		err = ufs_unlink(dir, dentry);
@@ -284,9 +282,6 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct ufs_dir_entry *old_de;
 	int err = -ENOENT;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
 	if (!old_de)
 		goto out;