Commit dc7af8dc authored by Al Viro's avatar Al Viro

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 21c3003d
...@@ -1759,6 +1759,7 @@ static inline u64 hash_name(const char *name) ...@@ -1759,6 +1759,7 @@ static inline u64 hash_name(const char *name)
static int link_path_walk(const char *name, struct nameidata *nd) static int link_path_walk(const char *name, struct nameidata *nd)
{ {
int err; int err;
int orig_depth = nd->depth;
while (*name=='/') while (*name=='/')
name++; name++;
...@@ -1867,11 +1868,11 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1867,11 +1868,11 @@ static int link_path_walk(const char *name, struct nameidata *nd)
} }
terminate_walk(nd); terminate_walk(nd);
Err: Err:
while (unlikely(nd->depth > 1)) while (unlikely(nd->depth > orig_depth))
put_link(nd); put_link(nd);
return err; return err;
OK: OK:
if (unlikely(nd->depth > 1)) { if (unlikely(nd->depth > orig_depth)) {
name = nd->stack[nd->depth - 1].name; name = nd->stack[nd->depth - 1].name;
err = walk_component(nd, LOOKUP_FOLLOW); err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd); put_link(nd);
...@@ -1979,10 +1980,7 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags, ...@@ -1979,10 +1980,7 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags,
return -ECHILD; return -ECHILD;
done: done:
current->total_link_count = 0; current->total_link_count = 0;
nd->depth++; return link_path_walk(s, nd);
retval = link_path_walk(s, nd);
nd->depth--;
return retval;
} }
static void path_cleanup(struct nameidata *nd) static void path_cleanup(struct nameidata *nd)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment