From e1d953645fd3c7af58c4ab8404c4c488e94e46e0 Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Date: Tue, 22 Sep 2009 12:52:17 -0500
Subject: [PATCH] --- yaml --- r: 166175 b: refs/heads/master c:
 9c2d2056647790c5034d722bd24e9d913ebca73c h: refs/heads/master i:   166173:
 11e63aecec245a519980ff75c5dc9c189735a26a   166171:
 f0158419bfc46b8ebf9fbe38223b62c393171b83   166167:
 54e44ce0106a9164b7ba6ac4af87656ed1036f30   166159:
 0f5ce324bfc0ba15b82ef3f9bdfd6eb588b8de88   166143:
 e264567707b1d299393fe4ea521ce2a6c5d692d1 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/ecryptfs/inode.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c36a7cf6575e..51ae7dd5c398 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a7b9c2f5df899f302ade45cf17ad753fe130fd
+refs/heads/master: 9c2d2056647790c5034d722bd24e9d913ebca73c
diff --git a/trunk/fs/ecryptfs/inode.c b/trunk/fs/ecryptfs/inode.c
index 2f0945d63297..056fed62d0de 100644
--- a/trunk/fs/ecryptfs/inode.c
+++ b/trunk/fs/ecryptfs/inode.c
@@ -476,6 +476,7 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry)
 	struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
 	struct dentry *lower_dir_dentry;
 
+	dget(lower_dentry);
 	lower_dir_dentry = lock_parent(lower_dentry);
 	rc = vfs_unlink(lower_dir_inode, lower_dentry);
 	if (rc) {
@@ -489,6 +490,7 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry)
 	d_drop(dentry);
 out_unlock:
 	unlock_dir(lower_dir_dentry);
+	dput(lower_dentry);
 	return rc;
 }