diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2021-06-03 16:53:23 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2021-07-06 20:14:44 -0400 |
| commit | 447c14d48968d0d4c2733c3f8052cb63aa1deb38 (patch) | |
| tree | 739f59ccc011ef01ca1d4bb59fdce926b0e627c2 /fs/lockd | |
| parent | 1beef1473ccaa70a2d54f9e76fba5f534931ea23 (diff) | |
| download | linux-447c14d48968d0d4c2733c3f8052cb63aa1deb38.tar.gz linux-447c14d48968d0d4c2733c3f8052cb63aa1deb38.tar.bz2 linux-447c14d48968d0d4c2733c3f8052cb63aa1deb38.zip | |
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>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/xdr4.c | 13 |
1 files changed, 6 insertions, 7 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 @@ -344,24 +344,23 @@ nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p) } int -nlm4svc_encode_shareres(struct svc_rqst *rqstp, __be32 *p) +nlm4svc_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 = nlm4_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 -nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p) +nlm4svc_encode_shareres(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; + *p++ = xdr_zero; /* sequence argument */ return xdr_ressize_check(rqstp, p); } |