lockd: Update the NLMv4 nlm_res 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 47a87ea4a99b11844960cdacef087777c9f2c0b8..6bd3bfb69ed7f20f83b679dbb9fc69fb25d5b60d 100644 (file)
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -295,6 +295,20 @@ nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p)
        return 1;
 }
 
+int
+nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p)
+{
+       struct xdr_stream *xdr = &rqstp->rq_arg_stream;
+       struct nlm_res *resp = rqstp->rq_argp;
+
+       if (!svcxdr_decode_cookie(xdr, &resp->cookie))
+               return 0;
+       if (!svcxdr_decode_stats(xdr, &resp->status))
+               return 0;
+
+       return 1;
+}
+
 int
 nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
 {
@@ -375,17 +389,6 @@ nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)
        return xdr_argsize_check(rqstp, p);
 }
 
-int
-nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p)
-{
-       struct nlm_res *resp = rqstp->rq_argp;
-
-       if (!(p = nlm4_decode_cookie(p, &resp->cookie)))
-               return 0;
-       resp->status = *p++;
-       return xdr_argsize_check(rqstp, p);
-}
-
 int
 nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p)
 {