lkml.org 
[lkml]   [2007]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 34/59] knfsd: fix setting of ACL server versions.
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: NeilBrown <neilb@suse.de>

    Due to silly typos, if the nfs versions are explicitly set,
    no NFSACL versions get enabled.

    Also improve an error message that would have made this bug
    a little easier to find.

    Signed-off-by: Neil Brown <neilb@suse.de>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    fs/nfsd/nfssvc.c | 8 ++++----
    net/sunrpc/svc.c | 3 ++-
    2 files changed, 6 insertions(+), 5 deletions(-)

    --- linux-2.6.19.2.orig/fs/nfsd/nfssvc.c
    +++ linux-2.6.19.2/fs/nfsd/nfssvc.c
    @@ -72,7 +72,7 @@ static struct svc_program nfsd_acl_progr
    .pg_prog = NFS_ACL_PROGRAM,
    .pg_nvers = NFSD_ACL_NRVERS,
    .pg_vers = nfsd_acl_versions,
    - .pg_name = "nfsd",
    + .pg_name = "nfsacl",
    .pg_class = "nfsd",
    .pg_stats = &nfsd_acl_svcstats,
    .pg_authenticate = &svc_set_client,
    @@ -118,16 +118,16 @@ int nfsd_vers(int vers, enum vers_op cha
    switch(change) {
    case NFSD_SET:
    nfsd_versions[vers] = nfsd_version[vers];
    - break;
    #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
    if (vers < NFSD_ACL_NRVERS)
    - nfsd_acl_version[vers] = nfsd_acl_version[vers];
    + nfsd_acl_versions[vers] = nfsd_acl_version[vers];
    #endif
    + break;
    case NFSD_CLEAR:
    nfsd_versions[vers] = NULL;
    #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
    if (vers < NFSD_ACL_NRVERS)
    - nfsd_acl_version[vers] = NULL;
    + nfsd_acl_versions[vers] = NULL;
    #endif
    break;
    case NFSD_TEST:
    --- linux-2.6.19.2.orig/net/sunrpc/svc.c
    +++ linux-2.6.19.2/net/sunrpc/svc.c
    @@ -910,7 +910,8 @@ err_bad_prog:

    err_bad_vers:
    #ifdef RPC_PARANOIA
    - printk("svc: unknown version (%d)\n", vers);
    + printk("svc: unknown version (%d for prog %d, %s)\n",
    + vers, prog, progp->pg_name);
    #endif
    serv->sv_stats->rpcbadfmt++;
    svc_putnl(resv, RPC_PROG_MISMATCH);
    --
    -
    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-02-03 03:53    [W:0.027 / U:62.068 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site