From: Andy Adamson Date: Thu, 14 Jan 2010 22:45:06 +0000 (-0500) Subject: nfs41: remove uneeded checks in callback processing X-Git-Tag: v2.6.34-rc1~190^2~22 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e95e60daee44fade63f32429ddcf1c2012a95632;p=~emulex%2Finfiniband.git nfs41: remove uneeded checks in callback processing All callback operations have arguments to decode and require processing. The preprocess_nfs4X_op functions catch unsupported or illegal ops so decode_args and process_op pointers are always non NULL. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index d3e07f46994..a6f2ded72b1 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -630,9 +630,8 @@ static __be32 process_op(uint32_t minorversion, int nop, maxlen = xdr_out->end - xdr_out->p; if (maxlen > 0 && maxlen < PAGE_SIZE) { - if (likely(op->decode_args != NULL)) - status = op->decode_args(rqstp, xdr_in, argp); - if (likely(status == 0 && op->process_op != NULL)) + status = op->decode_args(rqstp, xdr_in, argp); + if (likely(status == 0)) status = op->process_op(argp, resp); } else status = htonl(NFS4ERR_RESOURCE);