---

yaml
---
r: 252711
b: refs/heads/master
c: 0e54ec1
h: refs/heads/master
i:
  252709: d01247a
  252707: a237a39
  252703: e73eab9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfb55de89879a1c32a70d0a510b3701ed9a6b855
+refs/heads/master: 0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06

trunk/fs/ubifs/dir.c

@@ -656,8 +656,6 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
 	struct ubifs_inode *dir_ui = ubifs_inode(dir);
 	struct ubifs_budget_req req = { .mod_dent = 1, .dirtied_ino = 2 };
 
-	dentry_unhash(dentry);
-
 	/*
 	 * Budget request settings: deletion direntry, deletion inode and
 	 * changing the parent inode. If budgeting fails, go ahead anyway
@@ -978,9 +976,6 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,
 			.dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) };
 	struct timespec time;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	/*
 	 * Budget request settings: deletion direntry, new direntry, removing
 	 * the old inode, and changing old and new parent directory inodes.