lockd: Update the NLMv1 CANCEL 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/xdr.c b/fs/lockd/xdr.c
index 8a9f02e..ef38f07 100644 (file)
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -294,30 +294,34 @@ nlmsvc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p)
 }
 
 int
-nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
+nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p)
 {
-       struct nlm_res *resp = rqstp->rq_resp;
+       struct xdr_stream *xdr = &rqstp->rq_arg_stream;
+       struct nlm_args *argp = rqstp->rq_argp;
+       u32 exclusive;
 
-       if (!(p = nlm_encode_testres(p, resp)))
+       if (!svcxdr_decode_cookie(xdr, &argp->cookie))
                return 0;
-       return xdr_ressize_check(rqstp, p);
+       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;
+
+       return 1;
 }
 
 int
-nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p)
+nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
 {
-       struct nlm_args *argp = rqstp->rq_argp;
-       u32     exclusive;
+       struct nlm_res *resp = rqstp->rq_resp;
 
-       if (!(p = nlm_decode_cookie(p, &argp->cookie)))
-               return 0;
-       argp->block = ntohl(*p++);
-       exclusive = ntohl(*p++);
-       if (!(p = nlm_decode_lock(p, &argp->lock)))
+       if (!(p = nlm_encode_testres(p, resp)))
                return 0;
-       if (exclusive)
-               argp->lock.fl.fl_type = F_WRLCK;
-       return xdr_argsize_check(rqstp, p);
+       return xdr_ressize_check(rqstp, p);
 }
 
 int