lkml.org 
[lkml]   [2007]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/15] knfsd: nfs4 name->id mapping not correctly parsing negative downcall
    Date
    From: J. Bruce Fields <bfields@citi.umich.edu>

    Note that qword_get() returns length or -1, not an -ERROR.

    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    ---
    fs/nfsd/nfs4idmap.c | 8 +++++---
    1 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
    index 2ccffde..4c0c683 100644
    --- a/fs/nfsd/nfs4idmap.c
    +++ b/fs/nfsd/nfs4idmap.c
    @@ -207,6 +207,7 @@ idtoname_parse(struct cache_detail *cd, char *buf, int buflen)
    {
    struct ent ent, *res;
    char *buf1, *bp;
    + int len;
    int error = -EINVAL;

    if (buf[buflen - 1] != '\n')
    @@ -248,10 +249,11 @@ idtoname_parse(struct cache_detail *cd, char *buf, int buflen)
    goto out;

    /* Name */
    - error = qword_get(&buf, buf1, PAGE_SIZE);
    - if (error == -EINVAL)
    + error = -EINVAL;
    + len = qword_get(&buf, buf1, PAGE_SIZE);
    + if (len < 0)
    goto out;
    - if (error == -ENOENT)
    + if (len == 0)
    set_bit(CACHE_NEGATIVE, &ent.h.flags);
    else {
    if (error >= IDMAP_NAMESZ) {
    --
    1.5.3.rc5.19.g0734d
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-08-27 22:27    [W:0.020 / U:152.268 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site