diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2021-06-03 16:52:10 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2021-07-06 20:14:43 -0400 |
commit | 529ca3a116e8978575fec061a71fa6865a344891 (patch) | |
tree | 83b242526939963f37555246f3a6eb0a602f2781 /fs/lockd | |
parent | e96735a6980574ecbdb24c760b8d294095e47074 (diff) | |
download | linux-529ca3a116e8978575fec061a71fa6865a344891.tar.bz2 |
lockd: Update the NLMv1 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/xdr.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index 4fb6090bc915..9235e60b1769 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c @@ -42,18 +42,6 @@ loff_t_to_s32(loff_t offset) } /* - * XDR functions for basic NLM types - */ -static inline __be32 * -nlm_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 * constrains their length to exactly the length of an NFSv2 file @@ -361,11 +349,16 @@ nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p) int nlmsvc_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 = nlm_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; } |