---

yaml --- r: 298371 b: refs/heads/master c: 3f6c7c7 h: refs/heads/master i: 298369: 328d0de 298367: 82e8cc8 v: v3
git-mirror · Mar 31, 2012 · c1a8887 · c1a8887
1 parent 354af3d
commit c1a8887
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cda309de253f338b04d15b4478e45fc3a0fcc7a3
+refs/heads/master: 3f6c7c71a2af6eb306e16562c6ee1bfdb48015fb
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -1194,6 +1194,21 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 			status = 1;
 		}
 		mutex_unlock(&dir->i_mutex);
+		if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval)
+			status = d_revalidate(dentry, nd);
+		if (unlikely(status <= 0)) {
+			if (status < 0) {
+				dput(dentry);
+				return status;
+			}
+			if (!d_invalidate(dentry)) {
+				dput(dentry);
+				dentry = NULL;
+				need_reval = 1;
+				goto retry;
+			}
+		}
+		goto done;
 	}
 	if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval)
 		status = d_revalidate(dentry, nd);
@@ -1209,7 +1224,7 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 			goto retry;
 		}
 	}
-
+done:
 	path->mnt = mnt;
 	path->dentry = dentry;
 	err = follow_managed(path, nd->flags);