summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-04-12 18:23:09 +0200
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-04-26 01:32:36 +0200
commitdd55c89852481a0708c3fd4b48f3081f4280d9d3 (patch)
tree36e516d3802f5854a9e25610bdfd2382f497ef0d
parenteCryptfs: Remove extra d_delete in ecryptfs_rmdir (diff)
downloadlinux-dd55c89852481a0708c3fd4b48f3081f4280d9d3.tar.xz
linux-dd55c89852481a0708c3fd4b48f3081f4280d9d3.zip
eCryptfs: dput dentries returned from dget_parent
Call dput on the dentries previously returned by dget_parent() in ecryptfs_rename(). This is needed for supported eCryptfs mounts on top of the NFSv3 client. Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
-rw-r--r--fs/ecryptfs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 9c3c2f5bc6a6..72d357649599 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -608,8 +608,8 @@ ecryptfs_rename(struct inode *old_dir, struct dentry *old_dentry,
fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode);
out_lock:
unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
- dput(lower_new_dentry->d_parent);
- dput(lower_old_dentry->d_parent);
+ dput(lower_new_dir_dentry);
+ dput(lower_old_dir_dentry);
dput(lower_new_dentry);
dput(lower_old_dentry);
return rc;