]> git.hungrycats.org Git - linux/commit
eCryptfs: Remove extra d_delete in ecryptfs_rmdir
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>
Tue, 12 Apr 2011 16:21:36 +0000 (11:21 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Mar 2012 17:49:22 +0000 (09:49 -0800)
commit12a9959bcc17eca2567447abfab2ca7f7ebac594
treee65345744be199b4f67db94dcedfa3cb9507e62d
parent3c9b2dad7e98a942c6bca63bb95b66c0b3c9d0fd
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>
fs/ecryptfs/inode.c