NFSD: Make nfsd4_ops::opnum a u32

Avoid passing a "pointer to int" argument to xdr_stream_decode_u32.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 56d074a..73e7176 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -3282,7 +3282,7 @@ int nfsd4_max_reply(struct svc_rqst *rqstp, struct nfsd4_op *op)
 void warn_on_nonidempotent_op(struct nfsd4_op *op)
 {
        if (OPDESC(op)->op_flags & OP_MODIFIES_SOMETHING) {
-               pr_err("unable to encode reply to nonidempotent op %d (%s)\n",
+               pr_err("unable to encode reply to nonidempotent op %u (%s)\n",
                        op->opnum, nfsd4_op_name(op->opnum));
                WARN_ON_ONCE(1);
        }

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 777b118..a3cfc1d 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2419,9 +2419,8 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
                op = &argp->ops[i];
                op->replay = NULL;
 
-               READ_BUF(4);
-               op->opnum = be32_to_cpup(p++);
-
+               if (xdr_stream_decode_u32(argp->xdr, &op->opnum) < 0)
+                       return nfserr_bad_xdr;
                if (nfsd4_opnum_in_range(argp, op)) {
                        op->status = nfsd4_dec_ops[op->opnum](argp, &op->u);
                        if (op->status != nfs_ok)
@@ -5378,7 +5377,7 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)
        if (op->status && opdesc &&
                        !(opdesc->op_flags & OP_NONTRIVIAL_ERROR_ENCODE))
                goto status;
-       BUG_ON(op->opnum < 0 || op->opnum >= ARRAY_SIZE(nfsd4_enc_ops) ||
+       BUG_ON(op->opnum >= ARRAY_SIZE(nfsd4_enc_ops) ||
               !nfsd4_enc_ops[op->opnum]);
        encoder = nfsd4_enc_ops[op->opnum];
        op->status = encoder(resp, op->status, &op->u);

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index facc576..2c31f3a 100644 (file)
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -615,7 +615,7 @@ struct nfsd4_copy_notify {
 };
 
 struct nfsd4_op {
-       int                                     opnum;
+       u32                                     opnum;
        const struct nfsd4_operation *          opdesc;
        __be32                                  status;
        union nfsd4_op_u {