---

yaml --- r: 298374 b: refs/heads/master c: 08b0ab7 h: refs/heads/master v: v3
git-mirror · Mar 31, 2012 · c7b1a00 · c7b1a00
1 parent a5a3b47
commit c7b1a00
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acc9cb3cd425f479d8fc4a441bff45dce23aa6dd
+refs/heads/master: 08b0ab7c20f767187ae635d51bdd9d262ebe8357
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -1181,7 +1181,6 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 				return PTR_ERR(dentry);
 			}
 			/* known good */
-			need_reval = 0;
 			status = 1;
 		} else if (unlikely(d_need_lookup(dentry))) {
 			dentry = d_inode_lookup(parent, dentry, nd);
@@ -1190,10 +1189,8 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 				return PTR_ERR(dentry);
 			}
 			/* known good */
-			need_reval = 0;
 			status = 1;
-		}
-		if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval)
+		} else if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE))
 			status = d_revalidate(dentry, nd);
 		if (unlikely(status <= 0)) {
 			if (status < 0) {
@@ -1209,7 +1206,6 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 					return PTR_ERR(dentry);
 				}
 				/* known good */
-				need_reval = 0;
 				status = 1;
 			}
 		}
@@ -1226,7 +1222,6 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 		if (!d_invalidate(dentry)) {
 			dput(dentry);
 			dentry = NULL;
-			need_reval = 1;
 			goto retry;
 		}
 	}