---

yaml --- r: 298377 b: refs/heads/master c: a6ecdfc h: refs/heads/master i: 298375: 8a682ae v: v3
git-mirror · Mar 31, 2012 · b1c43e6 · b1c43e6
1 parent 45b05f8
commit b1c43e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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))