diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2021-06-03 22:53:29 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2021-07-07 02:14:44 +0200 |
| commit | 0ff5b50ab1f7f39862d0cdf6803978d31b27f25e (patch) | |
| tree | 2059ab6fadb7fceb519f51df62d17f5ac82ea0f2 /fs/lockd | |
| parent | lockd: Update the NLMv4 nlm_res results encoder to use struct xdr_stream (diff) | |
| download | linux-0ff5b50ab1f7f39862d0cdf6803978d31b27f25e.tar.xz linux-0ff5b50ab1f7f39862d0cdf6803978d31b27f25e.zip | |
lockd: Update the NLMv4 SHARE 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 | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index efdede71b951..98e957e4566c 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c @@ -40,15 +40,6 @@ loff_t_to_s64(loff_t offset) return res; } -static __be32 * -nlm4_encode_cookie(__be32 *p, struct nlm_cookie *c) -{ - *p++ = htonl(c->len); - memcpy(p, c->data, c->len); - p+=XDR_QUADLEN(c->len); - return p; -} - /* * NLM file handles are defined by specification to be a variable-length * XDR opaque no longer than 1024 bytes. However, this implementation @@ -356,11 +347,16 @@ nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p) int nlm4svc_encode_shareres(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))) + if (!svcxdr_encode_cookie(xdr, &resp->cookie)) return 0; - *p++ = resp->status; - *p++ = xdr_zero; /* sequence argument */ - return xdr_ressize_check(rqstp, p); + if (!svcxdr_encode_stats(xdr, resp->status)) + return 0; + /* sequence */ + if (xdr_stream_encode_u32(xdr, 0) < 0) + return 0; + + return 1; } |