lockd: Update the NLMv4 LOCK arguments decoder to use struct xdr_stream

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index cf64794..1d3e780 100644 (file)
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -265,34 +265,39 @@ nlm4svc_decode_testargs(struct svc_rqst *rqstp, __be32 *p)
 }
 
 int
-nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
-{
-       struct nlm_res *resp = rqstp->rq_resp;
-
-       if (!(p = nlm4_encode_testres(p, resp)))
-               return 0;
-       return xdr_ressize_check(rqstp, p);
-}
-
-int
 nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p)
 {
+       struct xdr_stream *xdr = &rqstp->rq_arg_stream;
        struct nlm_args *argp = rqstp->rq_argp;
-       u32     exclusive;
+       u32 exclusive;
 
-       if (!(p = nlm4_decode_cookie(p, &argp->cookie)))
+       if (!svcxdr_decode_cookie(xdr, &argp->cookie))
                return 0;
-       argp->block  = ntohl(*p++);
-       exclusive    = ntohl(*p++);
-       if (!(p = nlm4_decode_lock(p, &argp->lock)))
+       if (xdr_stream_decode_bool(xdr, &argp->block) < 0)
+               return 0;
+       if (xdr_stream_decode_bool(xdr, &exclusive) < 0)
+               return 0;
+       if (!svcxdr_decode_lock(xdr, &argp->lock))
                return 0;
        if (exclusive)
                argp->lock.fl.fl_type = F_WRLCK;
-       argp->reclaim = ntohl(*p++);
-       argp->state   = ntohl(*p++);
+       if (xdr_stream_decode_bool(xdr, &argp->reclaim) < 0)
+               return 0;
+       if (xdr_stream_decode_u32(xdr, &argp->state) < 0)
+               return 0;
        argp->monitor = 1;              /* monitor client by default */
 
-       return xdr_argsize_check(rqstp, p);
+       return 1;
+}
+
+int
+nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
+{
+       struct nlm_res *resp = rqstp->rq_resp;
+
+       if (!(p = nlm4_encode_testres(p, resp)))
+               return 0;
+       return xdr_ressize_check(rqstp, p);
 }
 
 int