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 038/110] link_path_walk: handle get_link() returning ERR_PTR() immediately
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    If we get ERR_PTR() from get_link(), we are guaranteed to get err != 0
    when we break out of do-while, so we are going to hit if (err) return err;
    shortly after it. Pull that into the if (IS_ERR(s)) body.

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

    diff --git a/fs/namei.c b/fs/namei.c
    index d729ef7..9937470 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -1792,7 +1792,9 @@ static int link_path_walk(const char *name, struct nameidata *nd)

    if (unlikely(IS_ERR(s))) {
    err = PTR_ERR(s);
    - break;
    + current->link_count--;
    + nd->depth--;
    + return err;
    }
    err = 0;
    if (likely(s)) {
    --
    2.1.4


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