---

yaml --- r: 209633 b: refs/heads/master c: 2e2e88e h: refs/heads/master i: 209631: 0f17e6f v: v3
git-mirror · Aug 18, 2010 · 863a362 · 863a362
1 parent 66b9a16
commit 863a362
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a48ee8a4ad26c3a538b6fc11a86a8f80c3dce18
+refs/heads/master: 2e2e88ea8c3bd9e1bd6e42faf047a4ac3fbb3b2f
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -709,6 +709,7 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 	dentry = __d_lookup(nd->path.dentry, name);
 	if (!dentry)
 		goto need_lookup;
+found:
 	if (dentry->d_op && dentry->d_op->d_revalidate)
 		goto need_revalidate;
 done:
@@ -766,14 +767,7 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 	 * we waited on the semaphore. Need to revalidate.
 	 */
 	mutex_unlock(&dir->i_mutex);
-	if (dentry->d_op && dentry->d_op->d_revalidate) {
-		dentry = do_revalidate(dentry, nd);
-		if (!dentry)
-			dentry = ERR_PTR(-ENOENT);
-	}
-	if (IS_ERR(dentry))
-		goto fail;
-	goto done;
+	goto found;
 
 need_revalidate:
 	dentry = do_revalidate(dentry, nd);