From 107401c059f98d387849dcfdd8e0c0208f04e086 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 30 May 2011 01:50:53 -0400
Subject: [PATCH] --- yaml --- r: 252927 b: refs/heads/master c:
 c7427d23f7ed695ac226dbe3a84d7f19091d34ce h: refs/heads/master i:   252925:
 cf121c34a56b2d71d52cc579762fbbae88d2c4e3   252923:
 b8c8bd8505efc1ece048ed48f0e56271e3f98f9e   252919:
 8ff67287d8b9f6926834fe1595cf4862b62aced1   252911:
 2d647819468031632c2012fc9615645f070931b5   252895:
 fb879d0eb7b4e35202c992eea4ee637fbce55cc7   252863:
 61da60d1f06b5fc832f0b954b6c101f680a69755   252799:
 fe87ed7ea9be9ca37e740419979c6e0561e9ddca   252671:
 313509f13bc801da6527a4236237b079a90fe4a5   252415:
 e5875fedb346d082f3b83c05ffb4745810dcb7f0   251903:
 cf09b58786132a68f0f916de43b7e625fce062c7 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/autofs4/root.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bf535bc59084..5445e310f65b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cebde2413ba42504cf2c10ec1d47582912435cd
+refs/heads/master: c7427d23f7ed695ac226dbe3a84d7f19091d34ce
diff --git a/trunk/fs/autofs4/root.c b/trunk/fs/autofs4/root.c
index 87d95a8cddbc..f55ae23b137e 100644
--- a/trunk/fs/autofs4/root.c
+++ b/trunk/fs/autofs4/root.c
@@ -583,8 +583,6 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
 	if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
 		return -EACCES;
 
-	dentry_unhash(dentry);
-
 	if (atomic_dec_and_test(&ino->count)) {
 		p_ino = autofs4_dentry_ino(dentry->d_parent);
 		if (p_ino && dentry->d_parent != dentry)