summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-04-12 11:21:36 -0500
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-04-25 18:32:35 -0500
commit35ffa948b2f7bdf79e488cd496232935d095087a (patch)
treec9b6ac16421f798813844b7299f6fbb8ee8baa14 /fs/ecryptfs
parent5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4 (diff)
downloadop-kernel-dev-35ffa948b2f7bdf79e488cd496232935d095087a.zip
op-kernel-dev-35ffa948b2f7bdf79e488cd496232935d095087a.tar.gz
eCryptfs: Remove extra d_delete in ecryptfs_rmdir
vfs_rmdir() already calls d_delete() on the lower dentry. That was being duplicated in ecryptfs_rmdir() and caused a NULL pointer dereference when NFSv3 was the lower filesystem. Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/inode.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index f99051b..9c3c2f5 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -538,8 +538,6 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
dget(lower_dentry);
rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
dput(lower_dentry);
- if (!rc)
- d_delete(lower_dentry);
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
unlock_dir(lower_dir_dentry);
OpenPOWER on IntegriCloud