eCryptfs: Clear i_nlink in rmdir
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>
Fri, 29 Apr 2011 21:26:27 +0000 (16:26 -0500)
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>
Fri, 27 May 2011 16:46:14 +0000 (11:46 -0500)
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 <tyhicks@linux.vnet.ibm.com>
Cc: <stable@kernel.org>
fs/ecryptfs/inode.c

index 4d4cc6a..94ab3c0 100644 (file)
@@ -527,6 +527,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);