From 65c343fd8b27a8eb0efc2edf7cd4c01a0ebab7b8 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 21 May 2012 17:30:10 +0200
Subject: [PATCH] --- yaml --- r: 310059 b: refs/heads/master c:
 54c33e7f95284539e52ec2d99dcdf6efd29b247f h: refs/heads/master i:   310057:
 6cbf4ae82f44c7a2618be1da3f6c3efb0fcfab8b   310055:
 25a2f953c088edbaa1ded937fd3be25921419a36 v: v3

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

diff --git a/[refs] b/[refs]
index 2a8f8dd139dd..ccb88315cc65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d45ea86792db9679ed010b2c3df3db32b2ce5bde
+refs/heads/master: 54c33e7f95284539e52ec2d99dcdf6efd29b247f
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index c6b996817bb3..a7e994bb78c2 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -2361,8 +2361,10 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
 	BUG_ON(nd->flags & LOOKUP_RCU);
 	inode = path->dentry->d_inode;
 	error = -ENOENT;
-	if (!inode)
-		goto exit_dput;
+	if (!inode) {
+		path_to_nameidata(path, nd);
+		goto exit;
+	}
 
 	if (should_follow_link(inode, !symlink_ok)) {
 		if (nd->flags & LOOKUP_RCU) {