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 45/79] link_path_walk: split "return from recursive call" path
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

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

    diff --git a/fs/namei.c b/fs/namei.c
    index 3c622ad..723dead 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -1818,23 +1818,6 @@ Walked:
    last->name = name;
    name = s;
    goto start;
    -
    -back:
    - name = last->name;
    - if (unlikely(err)) {
    - put_link(nd, &last->link, last->cookie);
    - current->link_count--;
    - nd->depth--;
    - last--;
    - goto Err;
    - } else {
    - err = walk_component(nd, LOOKUP_FOLLOW);
    - put_link(nd, &last->link, last->cookie);
    - current->link_count--;
    - nd->depth--;
    - last--;
    - goto Walked;
    - }
    }
    }
    if (!d_can_lookup(nd->path.dentry)) {
    @@ -1844,13 +1827,24 @@ back:
    }
    terminate_walk(nd);
    Err:
    - if (likely(!nd->depth))
    - return err;
    - goto back;
    + while (unlikely(nd->depth)) {
    + put_link(nd, &last->link, last->cookie);
    + current->link_count--;
    + nd->depth--;
    + last--;
    + }
    + return err;
    OK:
    - if (likely(!nd->depth))
    - return 0;
    - goto back;
    + if (unlikely(nd->depth)) {
    + name = last->name;
    + err = walk_component(nd, LOOKUP_FOLLOW);
    + put_link(nd, &last->link, last->cookie);
    + current->link_count--;
    + nd->depth--;
    + last--;
    + goto Walked;
    + }
    + return 0;
    }

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


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