diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-19 14:20:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-19 14:20:32 -0700 |
| commit | 9b030e2006546366c832911ca5eb9e785408795b (patch) | |
| tree | fe2b5913249c047fc8d7f851f7a6a0049825e2d3 /fs/ecryptfs/super.c | |
| parent | 76e506a754c9519ba0a948b475a62f31fac8b599 (diff) | |
| parent | 9f37622f897a90ad3c3da5c14d94d8f3ffc62b70 (diff) | |
| download | kernel_samsung_smdk4412-9b030e2006546366c832911ca5eb9e785408795b.zip kernel_samsung_smdk4412-9b030e2006546366c832911ca5eb9e785408795b.tar.gz kernel_samsung_smdk4412-9b030e2006546366c832911ca5eb9e785408795b.tar.bz2 | |
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:
eCryptfs: Turn lower lookup error messages into debug messages
eCryptfs: Copy lower directory inode times and size on link
ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy_inode
ecryptfs: fix error code for missing xattrs in lower fs
eCryptfs: Decrypt symlink target for stat size
eCryptfs: Strip metadata in xattr flag in encrypted view
eCryptfs: Clear buffer before reading in metadata xattr
eCryptfs: Rename ecryptfs_crypt_stat.num_header_bytes_at_front
eCryptfs: Fix metadata in xattr feature regression
Diffstat (limited to 'fs/ecryptfs/super.c')
| -rw-r--r-- | fs/ecryptfs/super.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c index fcef41c..278743c 100644 --- a/fs/ecryptfs/super.c +++ b/fs/ecryptfs/super.c @@ -86,7 +86,6 @@ static void ecryptfs_destroy_inode(struct inode *inode) if (lower_dentry->d_inode) { fput(inode_info->lower_file); inode_info->lower_file = NULL; - d_drop(lower_dentry); } } ecryptfs_destroy_crypt_stat(&inode_info->crypt_stat); |