diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
commit | d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b (patch) | |
tree | a9b7de7df6da5c3132cc68169b9c47ba288ccd42 /fs/ecryptfs/inode.c | |
parent | d55651168a20078a94597a297d5cdfd807bf07b6 (diff) | |
parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) |
Merge commit 'v2.6.32-rc3'
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 2f0945d63297..056fed62d0de 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
@@ -476,6 +476,7 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry) | |||
476 | struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir); | 476 | struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir); |
477 | struct dentry *lower_dir_dentry; | 477 | struct dentry *lower_dir_dentry; |
478 | 478 | ||
479 | dget(lower_dentry); | ||
479 | lower_dir_dentry = lock_parent(lower_dentry); | 480 | lower_dir_dentry = lock_parent(lower_dentry); |
480 | rc = vfs_unlink(lower_dir_inode, lower_dentry); | 481 | rc = vfs_unlink(lower_dir_inode, lower_dentry); |
481 | if (rc) { | 482 | if (rc) { |
@@ -489,6 +490,7 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry) | |||
489 | d_drop(dentry); | 490 | d_drop(dentry); |
490 | out_unlock: | 491 | out_unlock: |
491 | unlock_dir(lower_dir_dentry); | 492 | unlock_dir(lower_dir_dentry); |
493 | dput(lower_dentry); | ||
492 | return rc; | 494 | return rc; |
493 | } | 495 | } |
494 | 496 | ||