commit 35ffa948b2f7bdf79e488cd496232935d095087a
author Tyler Hicks <tyhicks@linux.vnet.ibm.com> Tue Apr 12 11:21:36 2011 -0500
committer Tyler Hicks <tyhicks@linux.vnet.ibm.com> Mon Apr 25 18:32:35 2011 -0500
tree c9b6ac16421f798813844b7299f6fbb8ee8baa14
parent 5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4

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>

fs/ecryptfs/inode.c

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 @@
 	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);