summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-03-30 14:18:50 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-31 16:03:16 -0400
commit08b0ab7c20f767187ae635d51bdd9d262ebe8357 (patch)
treeb3b7258f1bee1574df231279dec23fe0c92a2b46 /fs
parentacc9cb3cd425f479d8fc4a441bff45dce23aa6dd (diff)
untangling do_lookup() - get rid of need_reval in !dentry case
Everything arriving into if (!dentry) will have need_reval = 1. Indeed, the only way to get there with need_reval reset to 0 would be via if (unlikely(d_need_lookup(dentry))) goto unlazy; if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) { status = d_revalidate(dentry, nd); if (unlikely(status <= 0)) { if (status != -ECHILD) need_reval = 0; goto unlazy; ... unlazy: /* no assignments to dentry */ if (dentry && unlikely(d_need_lookup(dentry))) { dput(dentry); dentry = NULL; } and if d_need_lookup() had already been false the first time around, it will remain false on the second call as well. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 9ce43a358c3..14bb00a9fa9 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1181,7 +1181,6 @@ retry:
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 @@ retry:
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 @@ retry:
return PTR_ERR(dentry);
}
/* known good */
- need_reval = 0;
status = 1;
}
}
@@ -1226,7 +1222,6 @@ retry:
if (!d_invalidate(dentry)) {
dput(dentry);
dentry = NULL;
- need_reval = 1;
goto retry;
}
}