diff options
| author | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2011-04-12 11:21:36 -0500 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-03-17 14:03:56 +0100 |
| commit | 3c153f95d2e8dd33c3cc8d5432a57194c7bda933 (patch) | |
| tree | 7b122909479f9b897409f64d0d8a8599fc33a476 | |
| parent | 1663b5e456b6dc59d02224f93bd36d4580b94dd5 (diff) | |
eCryptfs: Remove extra d_delete in ecryptfs_rmdir
commit 35ffa948b2f7bdf79e488cd496232935d095087a upstream.
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.
BugLink: http://bugs.launchpad.net/bugs/723518
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Signed-off-by: Colin King <colin.king@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | fs/ecryptfs/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 30f9a5155e7..086a2424d18 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -539,8 +539,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); |