lkml.org 
[lkml]   [2006]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 018 of 18] knfsd: Fix up some bit-rot in exp_export

    The nfsservctl systemcall isn't used but recent nfs-utils releases for
    exporting filesystems, and consequently the code that is uses -
    exp_export - has suffered some bitrot.

    Particular:
    - some newly added fields in 'struct svc_export' are being initialised
    properly.
    - the return value is now always -ENOMEM ...

    This patch fixes both these problems.

    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./fs/nfsd/export.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    diff .prev/fs/nfsd/export.c ./fs/nfsd/export.c
    --- .prev/fs/nfsd/export.c 2006-12-08 12:08:37.000000000 +1100
    +++ ./fs/nfsd/export.c 2006-12-08 12:09:31.000000000 +1100
    @@ -955,6 +955,8 @@ exp_export(struct nfsctl_export *nxp)

    exp = exp_get_by_name(clp, nd.mnt, nd.dentry, NULL);

    + memset(&new, 0, sizeof(new));
    +
    /* must make sure there won't be an ex_fsid clash */
    if ((nxp->ex_flags & NFSEXP_FSID) &&
    (fsid_key = exp_get_fsid_key(clp, nxp->ex_dev)) &&
    @@ -985,6 +987,9 @@ exp_export(struct nfsctl_export *nxp)

    new.h.expiry_time = NEVER;
    new.h.flags = 0;
    + new.ex_path = kstrdup(nxp->ex_path, GFP_KERNEL);
    + if (! new.ex_path)
    + goto finish;
    new.ex_client = clp;
    new.ex_mnt = nd.mnt;
    new.ex_dentry = nd.dentry;
    @@ -1005,10 +1010,11 @@ exp_export(struct nfsctl_export *nxp)
    /* failed to create at least one index */
    exp_do_unexport(exp);
    cache_flush();
    - err = -ENOMEM;
    - }
    -
    + } else
    + err = 0;
    finish:
    + if (new.ex_path)
    + kfree(new.ex_path);
    if (exp)
    exp_put(exp);
    if (fsid_key && !IS_ERR(fsid_key))
    -
    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: 2006-12-08 02:19    [W:0.030 / U:0.016 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site