From 1f1ec06e9ef8448cf9f0e92fe274313ad8f3ff7c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 May 2011 13:42:08 -0700 Subject: [PATCH] --- yaml --- r: 252719 b: refs/heads/master c: 55e5b7e022eaaa805a44e3b6ecd5c8638d862050 h: refs/heads/master i: 252717: 3b3beb662b192cbf8f56c99e37e9a869a5274d3b 252715: 69b248474adec4bbd296bd467bf657a05a9d9b0c 252711: 85a3bfa081111a1d27e2429d145f197dbce2a011 252703: e73eab9a2fc183768335b59c459845a318b20fcd v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/inode.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index af639f0a5850..e72ca9aca801 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e41a59e0550b7bb40fe8c3438d690712e9fd511c +refs/heads/master: 55e5b7e022eaaa805a44e3b6ecd5c8638d862050 diff --git a/trunk/fs/ecryptfs/inode.c b/trunk/fs/ecryptfs/inode.c index 227b409b8406..4d4cc6a90cd5 100644 --- a/trunk/fs/ecryptfs/inode.c +++ b/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);