diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 11:07:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 11:07:50 -0700 |
| commit | aaab184276a6e20834f63735d433f94ef52a0497 (patch) | |
| tree | 89469029763d1fe713960200ac16014fef7c2167 /fs/ecryptfs/inode.c | |
| parent | e52e713ec30a31e9a4663d9aebbaae5ec07466a6 (diff) | |
| parent | a058bfbbeca576cf7c93ac4f16092f13f414434e (diff) | |
| download | op-kernel-dev-aaab184276a6e20834f63735d433f94ef52a0497.zip op-kernel-dev-aaab184276a6e20834f63735d433f94ef52a0497.tar.gz | |
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 227b409..bc116b9 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) 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); |
