lockd: Update the NLMv1 nlm_res results encoder 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 daf3524040d66a180f0ecc3c6df209c73ca2f1aa..4fb6090bc915828e8b992a37582d30507c8e78cb 100644 (file)
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -349,24 +349,23 @@ nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
 }
 
 int
-nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
+nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)
 {
+       struct xdr_stream *xdr = &rqstp->rq_res_stream;
        struct nlm_res *resp = rqstp->rq_resp;
 
-       if (!(p = nlm_encode_cookie(p, &resp->cookie)))
-               return 0;
-       *p++ = resp->status;
-       *p++ = xdr_zero;                /* sequence argument */
-       return xdr_ressize_check(rqstp, p);
+       return svcxdr_encode_cookie(xdr, &resp->cookie) &&
+               svcxdr_encode_stats(xdr, resp->status);
 }
 
 int
-nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)
+nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
 {
        struct nlm_res *resp = rqstp->rq_resp;
 
        if (!(p = nlm_encode_cookie(p, &resp->cookie)))
                return 0;
        *p++ = resp->status;
+       *p++ = xdr_zero;                /* sequence argument */
        return xdr_ressize_check(rqstp, p);
 }