lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 69/79] link_path_walk: move the OK: inside the loop
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    fewer labels that way; in particular, resuming after the end of
    nested symlink is straight-line.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    fs/namei.c | 30 +++++++++++++++---------------
    1 file changed, 15 insertions(+), 15 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 3faf3e2..49ed4b5 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -1798,11 +1798,21 @@ static int link_path_walk(const char *name, struct nameidata *nd)
    do {
    name++;
    } while (unlikely(*name == '/'));
    - if (!*name)
    - goto OK;
    -
    - err = walk_component(nd, LOOKUP_FOLLOW);
    -Walked:
    + if (unlikely(!*name)) {
    +OK:
    + /* called from path_init(), done */
    + if (!nd->depth)
    + return 0;
    + name = nd->stack[nd->depth - 1].name;
    + /* called from trailing_symlink(), done */
    + if (!name)
    + return 0;
    + /* last component of nested symlink */
    + err = walk_component(nd, LOOKUP_FOLLOW);
    + put_link(nd);
    + } else {
    + err = walk_component(nd, LOOKUP_FOLLOW);
    + }
    if (err < 0)
    break;

    @@ -1851,16 +1861,6 @@ Walked:
    }
    terminate_walk(nd);
    return err;
    -OK:
    - if (!nd->depth) /* called from path_init(), done */
    - return 0;
    - name = nd->stack[nd->depth - 1].name;
    - if (!name) /* called from trailing_symlink(), done */
    - return 0;
    -
    - err = walk_component(nd, LOOKUP_FOLLOW);
    - put_link(nd);
    - goto Walked;
    }

    static int path_init(int dfd, const struct filename *name, unsigned int flags,
    --
    2.1.4


    \
     
     \ /
      Last update: 2015-05-05 07:41    [W:4.176 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site