lkml.org 
[lkml]   [2015]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 091/110] link_path_walk: use explicit returns for failure exits
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

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

    diff --git a/fs/namei.c b/fs/namei.c
    index 27c3859..756e150 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -1772,7 +1772,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)

    err = may_lookup(nd);
    if (err)
    - break;
    + return err;

    hash_len = hash_name(name);

    @@ -1794,7 +1794,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
    struct qstr this = { { .hash_len = hash_len }, .name = name };
    err = parent->d_op->d_hash(parent, &this);
    if (err < 0)
    - break;
    + return err;
    hash_len = this.hash_len;
    name = this.name;
    }
    @@ -1829,15 +1829,13 @@ OK:
    err = walk_component(nd, WALK_GET);
    }
    if (err < 0)
    - break;
    + return err;

    if (err) {
    const char *s = get_link(nd);

    - if (unlikely(IS_ERR(s))) {
    - err = PTR_ERR(s);
    - break;
    - }
    + if (unlikely(IS_ERR(s)))
    + return PTR_ERR(s);
    err = 0;
    if (unlikely(!s)) {
    /* jumped */
    @@ -1848,12 +1846,9 @@ OK:
    continue;
    }
    }
    - if (!d_can_lookup(nd->path.dentry)) {
    - err = -ENOTDIR;
    - break;
    - }
    + if (unlikely(!d_can_lookup(nd->path.dentry)))
    + return -ENOTDIR;
    }
    - return err;
    }

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


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