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 57/79] get_link: nd->depth massage, part 6
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    make get_link() increment nd->depth on successful exit

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

    diff --git a/fs/namei.c b/fs/namei.c
    index 51bcbec..f81a029 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -918,8 +918,10 @@ const char *get_link(struct nameidata *nd)
    out:
    path_put(&nd->path);
    path_put(&last->link);
    + return res;
    }
    }
    + nd->depth++;
    return res;
    }

    @@ -1822,11 +1824,9 @@ Walked:
    }

    s = get_link(nd);
    - nd->depth++;

    if (unlikely(IS_ERR(s))) {
    err = PTR_ERR(s);
    - nd->depth--;
    goto Err;
    }
    err = 0;
    @@ -2001,7 +2001,6 @@ static int trailing_symlink(struct nameidata *nd)
    s = get_link(nd);
    if (unlikely(IS_ERR(s)))
    return PTR_ERR(s);
    - nd->depth++;
    if (unlikely(!s)) {
    nd->depth--;
    return 0;
    --
    2.1.4


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