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 016 of 18] knfsd: nfsd4: simplify filehandle check

    From: J.Bruce Fields <bfields@fieldses.org>

    Kill another big "if" clause.

    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./fs/nfsd/nfs4proc.c | 29 ++++++++++++-----------------
    1 file changed, 12 insertions(+), 17 deletions(-)

    diff .prev/fs/nfsd/nfs4proc.c ./fs/nfsd/nfs4proc.c
    --- .prev/fs/nfsd/nfs4proc.c 2006-12-08 12:09:30.000000000 +1100
    +++ ./fs/nfsd/nfs4proc.c 2006-12-08 12:09:30.000000000 +1100
    @@ -802,8 +802,10 @@ typedef __be32(*nfsd4op_func)(struct svc
    struct nfsd4_operation {
    nfsd4op_func op_func;
    u32 op_flags;
    +/* Most ops require a valid current filehandle; a few don't: */
    +#define ALLOWED_WITHOUT_FH 1
    /* GETATTR and ops not listed as returning NFS4ERR_MOVED: */
    -#define ALLOWED_ON_ABSENT_FS 1
    +#define ALLOWED_ON_ABSENT_FS 2
    };

    static struct nfsd4_operation nfsd4_ops[];
    @@ -874,18 +876,8 @@ nfsd4_proc_compound(struct svc_rqst *rqs

    opdesc = &nfsd4_ops[op->opnum];

    - /* All operations except RENEW, SETCLIENTID, RESTOREFH
    - * SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH
    - * require a valid current filehandle
    - */
    if (!cstate->current_fh.fh_dentry) {
    - if (!((op->opnum == OP_PUTFH) ||
    - (op->opnum == OP_PUTROOTFH) ||
    - (op->opnum == OP_SETCLIENTID) ||
    - (op->opnum == OP_SETCLIENTID_CONFIRM) ||
    - (op->opnum == OP_RENEW) ||
    - (op->opnum == OP_RESTOREFH) ||
    - (op->opnum == OP_RELEASE_LOCKOWNER))) {
    + if (!(opdesc->op_flags & ALLOWED_WITHOUT_FH)) {
    op->status = nfserr_nofilehandle;
    goto encode_op;
    }
    @@ -981,14 +973,15 @@ static struct nfsd4_operation nfsd4_ops[
    },
    [OP_PUTFH] = {
    .op_func = (nfsd4op_func)nfsd4_putfh,
    + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
    },
    [OP_PUTPUBFH] = {
    /* unsupported; just for future reference: */
    - .op_flags = ALLOWED_ON_ABSENT_FS,
    + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
    },
    [OP_PUTROOTFH] = {
    .op_func = (nfsd4op_func)nfsd4_putrootfh,
    - .op_flags = ALLOWED_ON_ABSENT_FS,
    + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
    },
    [OP_READ] = {
    .op_func = (nfsd4op_func)nfsd4_read,
    @@ -1007,10 +1000,11 @@ static struct nfsd4_operation nfsd4_ops[
    },
    [OP_RENEW] = {
    .op_func = (nfsd4op_func)nfsd4_renew,
    - .op_flags = ALLOWED_ON_ABSENT_FS,
    + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
    },
    [OP_RESTOREFH] = {
    .op_func = (nfsd4op_func)nfsd4_restorefh,
    + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
    },
    [OP_SAVEFH] = {
    .op_func = (nfsd4op_func)nfsd4_savefh,
    @@ -1020,10 +1014,11 @@ static struct nfsd4_operation nfsd4_ops[
    },
    [OP_SETCLIENTID] = {
    .op_func = (nfsd4op_func)nfsd4_setclientid,
    - .op_flags = ALLOWED_ON_ABSENT_FS,
    + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
    },
    [OP_SETCLIENTID_CONFIRM] = {
    .op_func = (nfsd4op_func)nfsd4_setclientid_confirm,
    + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
    },
    [OP_VERIFY] = {
    .op_func = (nfsd4op_func)nfsd4_verify,
    @@ -1033,7 +1028,7 @@ static struct nfsd4_operation nfsd4_ops[
    },
    [OP_RELEASE_LOCKOWNER] = {
    .op_func = (nfsd4op_func)nfsd4_release_lockowner,
    - .op_flags = ALLOWED_ON_ABSENT_FS,
    + .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
    },
    };

    -
    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:21    [W:0.021 / U:150.996 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site