---

yaml
---
r: 252723
b: refs/heads/master
c: 94f9901
h: refs/heads/master
i:
  252721: e159be0
  252719: 1f1ec06
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86905d6d96f138a99326016e4f0ca933200e0729
+refs/heads/master: 94f9901b6c05d5e1e38d887179b8307efbc8e10c

trunk/fs/affs/namei.c

@@ -320,8 +320,6 @@ affs_rmdir(struct inode *dir, struct dentry *dentry)
 		 dentry->d_inode->i_ino,
 		 (int)dentry->d_name.len, dentry->d_name.name);
 
-	dentry_unhash(dentry);
-
 	return affs_remove_header(dentry);
 }
 
@@ -419,9 +417,6 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct buffer_head *bh = NULL;
 	int retval;
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	pr_debug("AFFS: rename(old=%u,\"%*s\" to new=%u,\"%*s\")\n",
 		 (u32)old_dir->i_ino, (int)old_dentry->d_name.len, old_dentry->d_name.name,
 		 (u32)new_dir->i_ino, (int)new_dentry->d_name.len, new_dentry->d_name.name);