From 812bd724e3c511dc96067577136342e8eb68baf4 Mon Sep 17 00:00:00 2001 From: Andy Adamson Date: Thu, 14 Jan 2010 17:45:06 -0500 Subject: [PATCH] --- yaml --- r: 186138 b: refs/heads/master c: e95e60daee44fade63f32429ddcf1c2012a95632 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/callback_xdr.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e4856c3313b2..1d7ad98821f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b92b30190093377828efcde5fc4cf7598fa1ee46 +refs/heads/master: e95e60daee44fade63f32429ddcf1c2012a95632 diff --git a/trunk/fs/nfs/callback_xdr.c b/trunk/fs/nfs/callback_xdr.c index d3e07f469949..a6f2ded72b17 100644 --- a/trunk/fs/nfs/callback_xdr.c +++ b/trunk/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);