diff --git a/[refs] b/[refs]
index 44965c730f45..db8ff3d0125e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec335e91a4f088d8759c1311d0724e609d1c318e
+refs/heads/master: a6ecdfcfba9392f469992dd6016ceafb3ea62123
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index a0f9a0294ff2..1d60fdf01b37 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1188,12 +1188,12 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 				}
 				if (!d_invalidate(dentry)) {
 					dput(dentry);
-					dentry = d_alloc_and_lookup(parent, name, nd);
+					dentry = NULL;
 				}
 			}
-		} else if (!dentry) {
-			dentry = d_alloc_and_lookup(parent, name, nd);
 		}
+		if (!dentry)
+			dentry = d_alloc_and_lookup(parent, name, nd);
 	l:
 		mutex_unlock(&dir->i_mutex);
 		if (IS_ERR(dentry))