lockd: Update the NLMv4 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/xdr4.c b/fs/lockd/xdr4.c
index 9b8a7af..efdede7 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -344,6 +344,16 @@ nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
}
int
+nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p)
+{
+ struct xdr_stream *xdr = &rqstp->rq_res_stream;
+ struct nlm_res *resp = rqstp->rq_resp;
+
+ return svcxdr_encode_cookie(xdr, &resp->cookie) &&
+ svcxdr_encode_stats(xdr, resp->status);
+}
+
+int
nlm4svc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
{
struct nlm_res *resp = rqstp->rq_resp;
@@ -354,14 +364,3 @@ nlm4svc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
*p++ = xdr_zero; /* sequence argument */
return xdr_ressize_check(rqstp, p);
}
-
-int
-nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p)
-{
- struct nlm_res *resp = rqstp->rq_resp;
-
- if (!(p = nlm4_encode_cookie(p, &resp->cookie)))
- return 0;
- *p++ = resp->status;
- return xdr_ressize_check(rqstp, p);
-}