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

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

diff --git a/[refs] b/[refs]
index 7d5a71109b1a..8984a92cfeda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 526e7ce5528c8addcf154acec41b615f71dce7e1
+refs/heads/master: b80d2c228d8206cadc32226750dbbf3b707bdd19
diff --git a/trunk/fs/minix/namei.c b/trunk/fs/minix/namei.c
index f60aed8db9c4..6e6777f1b4b2 100644
--- a/trunk/fs/minix/namei.c
+++ b/trunk/fs/minix/namei.c
@@ -168,8 +168,6 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry)
 	struct inode * inode = dentry->d_inode;
 	int err = -ENOTEMPTY;
 
-	dentry_unhash(dentry);
-
 	if (minix_empty_dir(inode)) {
 		err = minix_unlink(dir, dentry);
 		if (!err) {
@@ -192,9 +190,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
 	struct minix_dir_entry * old_de;
 	int err = -ENOENT;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	old_de = minix_find_entry(old_dentry, &old_page);
 	if (!old_de)
 		goto out;