From 3f489744abfd6a886b220a7952afc79eba8b1c02 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 27 May 2011 13:42:18 -0700
Subject: [PATCH] --- yaml --- r: 252729 b: refs/heads/master c:
 f4ff0e25c5093dd89e9cac4a8f71a57587ada787 h: refs/heads/master i:   252727:
 552087410d55cebdcc9227a9aedcdf07887497e5 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/fat/namei_msdos.c | 5 -----
 trunk/fs/fat/namei_vfat.c  | 5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index c701ff7cb848..168dd93b9bef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45adfef7d023004ff95bf63b5f2f0e2d88afac3f
+refs/heads/master: f4ff0e25c5093dd89e9cac4a8f71a57587ada787
diff --git a/trunk/fs/fat/namei_msdos.c b/trunk/fs/fat/namei_msdos.c
index be15437c272e..3b222dafd15b 100644
--- a/trunk/fs/fat/namei_msdos.c
+++ b/trunk/fs/fat/namei_msdos.c
@@ -326,8 +326,6 @@ static int msdos_rmdir(struct inode *dir, struct dentry *dentry)
 	struct fat_slot_info sinfo;
 	int err;
 
-	dentry_unhash(dentry);
-
 	lock_super(sb);
 	/*
 	 * Check whether the directory is not in use, then check
@@ -459,9 +457,6 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
 	old_inode = old_dentry->d_inode;
 	new_inode = new_dentry->d_inode;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	err = fat_scan(old_dir, old_name, &old_sinfo);
 	if (err) {
 		err = -EIO;
diff --git a/trunk/fs/fat/namei_vfat.c b/trunk/fs/fat/namei_vfat.c
index c61a6789f36c..20b4ea53fdc4 100644
--- a/trunk/fs/fat/namei_vfat.c
+++ b/trunk/fs/fat/namei_vfat.c
@@ -824,8 +824,6 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry)
 	struct fat_slot_info sinfo;
 	int err;
 
-	dentry_unhash(dentry);
-
 	lock_super(sb);
 
 	err = fat_dir_empty(inode);
@@ -933,9 +931,6 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
 	int err, is_dir, update_dotdot, corrupt = 0;
 	struct super_block *sb = old_dir->i_sb;
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
 	old_inode = old_dentry->d_inode;
 	new_inode = new_dentry->d_inode;