Commit ef1a3e7b authored by Al Viro's avatar Al Viro

link_path_walk: nd->depth massage, part 4

lift increment/decrement into link_path_walk() callers.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent da4e0be0
...@@ -1763,7 +1763,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1763,7 +1763,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if (!*name) if (!*name)
return 0; return 0;
nd->depth++;
/* At this point we know we have a real path component. */ /* At this point we know we have a real path component. */
for(;;) { for(;;) {
u64 hash_len; u64 hash_len;
...@@ -1873,7 +1872,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1873,7 +1872,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
nd->depth--; nd->depth--;
put_link(nd); put_link(nd);
} }
nd->depth--;
return err; return err;
OK: OK:
if (unlikely(nd->depth > 1)) { if (unlikely(nd->depth > 1)) {
...@@ -1883,7 +1881,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1883,7 +1881,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
put_link(nd); put_link(nd);
goto Walked; goto Walked;
} }
nd->depth--;
return 0; return 0;
} }
...@@ -1986,7 +1983,10 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags, ...@@ -1986,7 +1983,10 @@ 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;
return link_path_walk(s, nd); nd->depth++;
retval = link_path_walk(s, nd);
nd->depth--;
return retval;
} }
static void path_cleanup(struct nameidata *nd) static void path_cleanup(struct nameidata *nd)
...@@ -2020,7 +2020,9 @@ static int trailing_symlink(struct nameidata *nd) ...@@ -2020,7 +2020,9 @@ static int trailing_symlink(struct nameidata *nd)
nd->flags |= LOOKUP_JUMPED; nd->flags |= LOOKUP_JUMPED;
} }
nd->inode = nd->path.dentry->d_inode; nd->inode = nd->path.dentry->d_inode;
nd->depth++;
error = link_path_walk(s, nd); error = link_path_walk(s, nd);
nd->depth--;
if (unlikely(error)) if (unlikely(error))
put_link(nd); put_link(nd);
return error; return error;
......
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