diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-18 18:45:16 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:19:53 -0400 |
| commit | 172a39a059bb8d84649bcad3e252fe416ad188a8 (patch) | |
| tree | 1c64b817bd56640a252f11325618ccc30ecf493a /fs/namei.c | |
| parent | namei: expand nested_symlink() in its only caller (diff) | |
| download | linux-dev-172a39a059bb8d84649bcad3e252fe416ad188a8.tar.xz linux-dev-172a39a059bb8d84649bcad3e252fe416ad188a8.zip | |
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: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | fs/namei.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c index 7fcda918a24f..2354d4fc0038 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -880,8 +880,7 @@ out: return res; } -static __always_inline int -follow_link(struct path *link, struct nameidata *nd, void **p) +static int follow_link(struct path *link, struct nameidata *nd, void **p) { const char *s = get_link(link, nd, p); int error; @@ -1815,10 +1814,29 @@ static int link_path_walk(const char *name, struct nameidata *nd) do { struct path link = nd->link; void *cookie; + const char *s = get_link(&link, nd, &cookie); - err = follow_link(&link, nd, &cookie); - if (err) + if (unlikely(IS_ERR(s))) { + err = PTR_ERR(s); 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); put_link(nd, &link, cookie); } while (err > 0); |