From: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Date: Tue, 12 Apr 2011 16:21:36 +0000 (-0500)
Subject: eCryptfs: Remove extra d_delete in ecryptfs_rmdir
X-Git-Tag: v2.6.39-rc5~8^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35ffa948b2f7bdf79e488cd496232935d095087a;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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>
---

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