From 7902c1d2ef0dafb3c93f28314a8568d04a64bdf9 Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Tue, 18 Jan 2011 12:06:10 +0800
Subject: [PATCH] --- yaml --- r: 231783 b: refs/heads/master c:
 8931221411f9ff950de8fd686dc5ab881394cb9a h: refs/heads/master i:   231781:
 a6ee6b93614278f0d76e3ee17394e31eaa6e84b2   231779:
 e05b38c118b3c27e2eef4705f8e1aefbae5ae57e   231775:
 1aa6082f576d03b33bc9b042151d40e46ad98d0c v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 339d27636e47..520983bae4c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c14cc63a63e94d490ac6517a555113c30d420db4
+refs/heads/master: 8931221411f9ff950de8fd686dc5ab881394cb9a
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index b753192d8c3f..7d77f24d32a9 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1272,8 +1272,10 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 	path->mnt = mnt;
 	path->dentry = dentry;
 	err = follow_managed(path, nd->flags);
-	if (unlikely(err < 0))
+	if (unlikely(err < 0)) {
+		path_put_conditional(path, nd);
 		return err;
+	}
 	*inode = path->dentry->d_inode;
 	return 0;