openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Chuck Lever 2021-06-03 16:53:29 -04:00 committed by J. Bruce Fields
parent 447c14d489
commit 0ff5b50ab1
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/lockd/xdr4.c
View File

@ -40,15 +40,6 @@ loff_t_to_s64(loff_t offset)
return res; 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 * NLM file handles are defined by specification to be a variable-length
* XDR opaque no longer than 1024 bytes. However, this implementation * XDR opaque no longer than 1024 bytes. However, this implementation
@ -356,11 +347,16 @@ nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p)
int int
nlm4svc_encode_shareres(struct svc_rqst *rqstp, __be32 *p) nlm4svc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_res_stream;
struct nlm_res *resp = rqstp->rq_resp; struct nlm_res *resp = rqstp->rq_resp;
if (!(p = nlm4_encode_cookie(p, &resp->cookie))) if (!svcxdr_encode_cookie(xdr, &resp->cookie))
return 0; return 0;
*p++ = resp->status; if (!svcxdr_encode_stats(xdr, resp->status))
*p++ = xdr_zero; /* sequence argument */ return 0;
return xdr_ressize_check(rqstp, p); /* sequence */
if (xdr_stream_encode_u32(xdr, 0) < 0)
return 0;
return 1;
} }