---

yaml
---
r: 252707
b: refs/heads/master
c: cf0f053
h: refs/heads/master
i:
  252705: 79115f2
  252703: e73eab9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 873ae4d5a8b282c6e2bbc09c6d59eeb1bec97ef7
+refs/heads/master: cf0f0536fa65ca1353476c49feed34891f3f7134

trunk/fs/jffs2/dir.c

@@ -609,8 +609,6 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)
 	int ret;
 	uint32_t now = get_seconds();
 
-	dentry_unhash(dentry);
-
 	for (fd = f->dents ; fd; fd = fd->next) {
 		if (fd->ino)
 			return -ENOTEMPTY;
@@ -786,9 +784,6 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
 	uint8_t type;
 	uint32_t now;
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	/* The VFS will check for us and prevent trying to rename a
 	 * file over a directory and vice versa, but if it's a directory,
 	 * the VFS can't check whether the victim is empty. The filesystem