Messages in this thread Patch in this message | | | From | Al Viro <> | Subject | [PATCH 09/24] namei: fold follow_link() into link_path_walk() | Date | Mon, 20 Apr 2015 19:12:53 +0100 |
| |
From: Al Viro <viro@zeniv.linux.org.uk>
... 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> --- fs/namei.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c index e07bf5c..48b2f17 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -920,8 +920,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) { char *s = get_link(link, nd, p); int error; @@ -1846,10 +1845,29 @@ static int link_path_walk(const char *name, struct nameidata *nd) do { struct path link = next; void *cookie; + 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, &next, LOOKUP_FOLLOW); put_link(nd, &link, cookie); } while (err > 0); -- 2.1.4
| |