---

yaml
---
r: 252719
b: refs/heads/master
c: 55e5b7e
h: refs/heads/master
i:
  252717: 3b3beb6
  252715: 69b2484
  252711: 85a3bfa
  252703: e73eab9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e41a59e0550b7bb40fe8c3438d690712e9fd511c
+refs/heads/master: 55e5b7e022eaaa805a44e3b6ecd5c8638d862050

trunk/fs/ecryptfs/inode.c

@@ -521,8 +521,6 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
 	struct dentry *lower_dir_dentry;
 	int rc;
 
-	dentry_unhash(dentry);
-
 	lower_dentry = ecryptfs_dentry_to_lower(dentry);
 	dget(dentry);
 	lower_dir_dentry = lock_parent(lower_dentry);
@@ -573,9 +571,6 @@ ecryptfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct dentry *lower_new_dir_dentry;
 	struct dentry *trap = NULL;
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	lower_old_dentry = ecryptfs_dentry_to_lower(old_dentry);
 	lower_new_dentry = ecryptfs_dentry_to_lower(new_dentry);
 	dget(lower_old_dentry);