aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-05-03 21:16:35 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-10 22:20:06 -0400
commitdc7af8dc05bc46410b978dae14fda8414b65db30 (patch)
tree380694adc5f0fdaa6dda47490e06641f5c53564d
parentput_link: nd->depth massage, part 8 (diff)
downloadlinux-dev-dc7af8dc05bc46410b978dae14fda8414b65db30.tar.xz
linux-dev-dc7af8dc05bc46410b978dae14fda8414b65db30.zip
link_path_walk: nd->depth massage, part 9
Make link_path_walk() work with any value of nd->depth on entry - memorize it and use it in tests instead of comparing with 1. Don't bother with increment/decrement in path_init(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 1f6195535206..bc6d67e1b00e 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1759,6 +1759,7 @@ static inline u64 hash_name(const char *name)
static int link_path_walk(const char *name, struct nameidata *nd)
{
int err;
+ int orig_depth = nd->depth;
while (*name=='/')
name++;
@@ -1867,11 +1868,11 @@ Walked:
}
terminate_walk(nd);
Err:
- while (unlikely(nd->depth > 1))
+ while (unlikely(nd->depth > orig_depth))
put_link(nd);
return err;
OK:
- if (unlikely(nd->depth > 1)) {
+ if (unlikely(nd->depth > orig_depth)) {
name = nd->stack[nd->depth - 1].name;
err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd);
@@ -1979,10 +1980,7 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags,
return -ECHILD;
done:
current->total_link_count = 0;
- nd->depth++;
- retval = link_path_walk(s, nd);
- nd->depth--;
- return retval;
+ return link_path_walk(s, nd);
}
static void path_cleanup(struct nameidata *nd)