summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2010-01-14 17:45:06 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-02-10 08:30:57 -0500
commite95e60daee44fade63f32429ddcf1c2012a95632 (patch)
treebc9a627467386a3a7629b81a4d25b8c1d191d701 /fs/nfs
parentb92b30190093377828efcde5fc4cf7598fa1ee46 (diff)
downloadblackbird-op-linux-e95e60daee44fade63f32429ddcf1c2012a95632.tar.gz
blackbird-op-linux-e95e60daee44fade63f32429ddcf1c2012a95632.zip
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 <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/callback_xdr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index d3e07f469949..a6f2ded72b17 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);
OpenPOWER on IntegriCloud