Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55e5b7e0 authored by Sage Weil's avatar Sage Weil Committed by Al Viro
Browse files

ecryptfs: remove unnecessary dentry_unhash on rmdir, dir rename 



ecryptfs does not have problems with references to unlinked directories.

CC: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
CC: Dustin Kirkland <kirkland@canonical.com>
CC: ecryptfs-devel@lists.launchpad.net
Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e41a59e0

fs/ecryptfs/inode.c

+0 −5
Original line number Diff line number Diff line
@@ -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);