diff options
author | Sage Weil <sage@newdream.net> | 2011-05-27 16:42:08 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-28 01:02:52 -0400 |
commit | 55e5b7e022eaaa805a44e3b6ecd5c8638d862050 (patch) | |
tree | 0b0c1b2d61769aef13e74ab54d43ce06e2b0fe0d /fs/ecryptfs | |
parent | e41a59e0550b7bb40fe8c3438d690712e9fd511c (diff) |
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: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r-- | fs/ecryptfs/inode.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 227b409b8406..4d4cc6a90cd5 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
@@ -521,8 +521,6 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
521 | struct dentry *lower_dir_dentry; | 521 | struct dentry *lower_dir_dentry; |
522 | int rc; | 522 | int rc; |
523 | 523 | ||
524 | dentry_unhash(dentry); | ||
525 | |||
526 | lower_dentry = ecryptfs_dentry_to_lower(dentry); | 524 | lower_dentry = ecryptfs_dentry_to_lower(dentry); |
527 | dget(dentry); | 525 | dget(dentry); |
528 | lower_dir_dentry = lock_parent(lower_dentry); | 526 | lower_dir_dentry = lock_parent(lower_dentry); |
@@ -573,9 +571,6 @@ ecryptfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
573 | struct dentry *lower_new_dir_dentry; | 571 | struct dentry *lower_new_dir_dentry; |
574 | struct dentry *trap = NULL; | 572 | struct dentry *trap = NULL; |
575 | 573 | ||
576 | if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) | ||
577 | dentry_unhash(new_dentry); | ||
578 | |||
579 | lower_old_dentry = ecryptfs_dentry_to_lower(old_dentry); | 574 | lower_old_dentry = ecryptfs_dentry_to_lower(old_dentry); |
580 | lower_new_dentry = ecryptfs_dentry_to_lower(new_dentry); | 575 | lower_new_dentry = ecryptfs_dentry_to_lower(new_dentry); |
581 | dget(lower_old_dentry); | 576 | dget(lower_old_dentry); |