Commit 0fd889d5 authored by Al Viro's avatar Al Viro

get_link: nd->depth massage, part 6

make get_link() increment nd->depth on successful exit
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f7df08ee
...@@ -918,8 +918,10 @@ const char *get_link(struct nameidata *nd) ...@@ -918,8 +918,10 @@ const char *get_link(struct nameidata *nd)
out: out:
path_put(&nd->path); path_put(&nd->path);
path_put(&last->link); path_put(&last->link);
return res;
} }
} }
nd->depth++;
return res; return res;
} }
...@@ -1830,11 +1832,9 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1830,11 +1832,9 @@ static int link_path_walk(const char *name, struct nameidata *nd)
} }
s = get_link(nd); s = get_link(nd);
nd->depth++;
if (unlikely(IS_ERR(s))) { if (unlikely(IS_ERR(s))) {
err = PTR_ERR(s); err = PTR_ERR(s);
nd->depth--;
goto Err; goto Err;
} }
err = 0; err = 0;
...@@ -2009,7 +2009,6 @@ static int trailing_symlink(struct nameidata *nd) ...@@ -2009,7 +2009,6 @@ static int trailing_symlink(struct nameidata *nd)
s = get_link(nd); s = get_link(nd);
if (unlikely(IS_ERR(s))) if (unlikely(IS_ERR(s)))
return PTR_ERR(s); return PTR_ERR(s);
nd->depth++;
if (unlikely(!s)) { if (unlikely(!s)) {
nd->depth--; nd->depth--;
return 0; return 0;
......
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