On Wed, 2010-01-06 at 13:23 -0500, andros@xxxxxxxxxx wrote:
> From: Andy Adamson <andros@xxxxxxxxxx>
>
> Skip all other processing when error is encountered.
>
> Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
> ---
> fs/nfs/callback_xdr.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
> index e24487d..3637e9a 100644
> --- a/fs/nfs/callback_xdr.c
> +++ b/fs/nfs/callback_xdr.c
> @@ -613,7 +613,7 @@ static __be32 process_op(uint32_t minorversion, int nop,
> dprintk("%s: start\n", __func__);
> status = decode_op_hdr(xdr_in, &op_nr);
> if (unlikely(status))
> - goto out;
> + goto encode_hdr;
>
> dprintk("%s: minorversion=%d nop=%d op_nr=%u\n",
> __func__, minorversion, nop, op_nr);
> @@ -622,16 +622,19 @@ static __be32 process_op(uint32_t minorversion, int nop,
> preprocess_nfs4_op(op_nr, &op);
> if (status == htonl(NFS4ERR_OP_ILLEGAL))
> op_nr = OP_CB_ILLEGAL;
> -out:
> + if (status)
> + goto encode_hdr;
> +
> maxlen = xdr_out->end - xdr_out->p;
> if (maxlen > 0 && maxlen < PAGE_SIZE) {
> - if (likely(status == 0 && op->decode_args != NULL))
> + if (likely(op->decode_args != NULL))
> status = op->decode_args(rqstp, xdr_in, argp);
> if (likely(status == 0 && op->process_op != NULL))
> status = op->process_op(argp, resp);
> } else
> status = htonl(NFS4ERR_RESOURCE);
>
> +encode_hdr:
> res = encode_op_hdr(xdr_out, op_nr, status);
> if (status == 0)
> status = res;
Same problem. You have a random value for op_nr...
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
