From 447c14d48968d0d4c2733c3f8052cb63aa1deb38 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 3 Jun 2021 16:53:23 -0400 Subject: [PATCH] lockd: Update the NLMv4 nlm_res results encoder to use struct xdr_stream Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields --- fs/lockd/xdr4.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index 9b8a7afb935c..efdede71b951 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c @@ -343,6 +343,16 @@ nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p) svcxdr_encode_testrply(xdr, resp); } +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) { @@ -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); -}