---

yaml
---
r: 251699
b: refs/heads/master
c: 052e2a1
h: refs/heads/master
i:
  251697: 7cd37b8
  251695: 7660fbe
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5afcb940fa37f57d124155f30a1a8d7794a476e0
+refs/heads/master: 052e2a1ba2d07e724ae9cc0608389292276cb77a

trunk/fs/nfs/dir.c

@@ -1748,8 +1748,6 @@ static int nfs_rmdir(struct inode *dir, struct dentry *dentry)
 	dfprintk(VFS, "NFS: rmdir(%s/%ld), %s\n",
 			dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
 
-	dentry_unhash(dentry);
-
 	error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
 	/* Ensure the VFS deletes this inode */
 	if (error == 0 && dentry->d_inode != NULL)
@@ -1959,9 +1957,6 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 		 new_dentry->d_parent->d_name.name, new_dentry->d_name.name,
 		 new_dentry->d_count);
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	/*
 	 * For non-directories, check whether the target is busy and if so,
 	 * make a copy of the dentry and then do a silly-rename. If the