diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 14:07:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 14:07:50 -0400 |
commit | aaab184276a6e20834f63735d433f94ef52a0497 (patch) | |
tree | 89469029763d1fe713960200ac16014fef7c2167 /fs/ecryptfs/inode.c | |
parent | e52e713ec30a31e9a4663d9aebbaae5ec07466a6 (diff) | |
parent | a058bfbbeca576cf7c93ac4f16092f13f414434e (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
MAINTAINERS: Update eCryptfs mailing list
eCryptfs: Allow 2 scatterlist entries for encrypted filenames
eCryptfs: Clear i_nlink in rmdir
Diffstat (limited to 'fs/ecryptfs/inode.c')
-rw-r--r-- | 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 227b409b840..bc116b9ffcf 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
@@ -529,6 +529,8 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
529 | dget(lower_dentry); | 529 | dget(lower_dentry); |
530 | rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry); | 530 | rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry); |
531 | dput(lower_dentry); | 531 | dput(lower_dentry); |
532 | if (!rc && dentry->d_inode) | ||
533 | clear_nlink(dentry->d_inode); | ||
532 | fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); | 534 | fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); |
533 | dir->i_nlink = lower_dir_dentry->d_inode->i_nlink; | 535 | dir->i_nlink = lower_dir_dentry->d_inode->i_nlink; |
534 | unlock_dir(lower_dir_dentry); | 536 | unlock_dir(lower_dir_dentry); |