Commit 172a39a0 authored by Al Viro's avatar Al Viro

namei: expand the call of follow_link() in link_path_walk()

... and strip __always_inline from follow_link() - remaining callers
don't need that.

Now link_path_walk() recursion is a direct one.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5a460275
...@@ -880,8 +880,7 @@ get_link(struct path *link, struct nameidata *nd, void **p) ...@@ -880,8 +880,7 @@ get_link(struct path *link, struct nameidata *nd, void **p)
return res; return res;
} }
static __always_inline int static int follow_link(struct path *link, struct nameidata *nd, void **p)
follow_link(struct path *link, struct nameidata *nd, void **p)
{ {
const char *s = get_link(link, nd, p); const char *s = get_link(link, nd, p);
int error; int error;
...@@ -1815,10 +1814,29 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1815,10 +1814,29 @@ static int link_path_walk(const char *name, struct nameidata *nd)
do { do {
struct path link = nd->link; struct path link = nd->link;
void *cookie; void *cookie;
const char *s = get_link(&link, nd, &cookie);
err = follow_link(&link, nd, &cookie); if (unlikely(IS_ERR(s))) {
if (err) err = PTR_ERR(s);
break; break;
}
err = 0;
if (likely(s)) {
if (*s == '/') {
if (!nd->root.mnt)
set_root(nd);
path_put(&nd->path);
nd->path = nd->root;
path_get(&nd->root);
nd->flags |= LOOKUP_JUMPED;
}
nd->inode = nd->path.dentry->d_inode;
err = link_path_walk(s, nd);
if (unlikely(err)) {
put_link(nd, &link, cookie);
break;
}
}
err = walk_component(nd, LOOKUP_FOLLOW); err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd, &link, cookie); put_link(nd, &link, cookie);
} while (err > 0); } while (err > 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