From: Tyler Hicks <[email protected]> eCryptfs wasn't clearing the eCryptfs inode's i_nlink after a successful vfs_rmdir() on the lower directory. This resulted in the inode evict and destroy paths to be missed.
https://bugs.launchpad.net/ecryptfs/+bug/723518 Signed-off-by: Tyler Hicks <[email protected]> Cc: <[email protected]> (cherry picked from commit 07850552b92b3637fa56767b5e460b4238014447) BugLink: http://bugs.launchpad.net/bugs/723518 Cc: Tyler Hicks <[email protected]> Signed-off-by: Colin King <[email protected]> Signed-off-by: Tim Gardner <[email protected]> --- fs/ecryptfs/inode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 939289e..d961876 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -575,6 +575,8 @@ 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 && dentry->d_inode) + clear_nlink(dentry->d_inode); 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); -- 1.7.9 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
