From f4da6453cb38e4480e2350a4caf2ca7b74d49acd Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 26 Mar 2012 12:54:19 +0200
Subject: [PATCH] --- yaml --- r: 298368 b: refs/heads/master c:
 fa4ee159512ee39b6c65ac40db986ea7a2f7de60 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0b302b8be9b6..8101991d31b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4613ad180d19082f99551477dcb13cb23d23661b
+refs/heads/master: fa4ee159512ee39b6c65ac40db986ea7a2f7de60
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index e615ff37e27d..768f2366bddd 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1139,6 +1139,8 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 			return -ECHILD;
 		nd->seq = seq;
 
+		if (unlikely(d_need_lookup(dentry)))
+			goto unlazy;
 		if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) {
 			status = d_revalidate(dentry, nd);
 			if (unlikely(status <= 0)) {
@@ -1147,8 +1149,6 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 				goto unlazy;
 			}
 		}
-		if (unlikely(d_need_lookup(dentry)))
-			goto unlazy;
 		path->mnt = mnt;
 		path->dentry = dentry;
 		if (unlikely(!__follow_mount_rcu(nd, path, inode)))