xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lockd: Update the NLMv1 nlm_res results encoder to use struct xdr_stream

Browse Source 
[ Upstream commit e96735a6980574ecbdb24c760b8d294095e47074 ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever
2021-06-03 16:52:04 -04:00
committed by Greg Kroah-Hartman
parent d0ddd21bd5
commit b049476790
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/lockd/xdr.c
View File

@@ -348,6 +348,16 @@ nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
svcxdr_encode_testrply(xdr, resp); svcxdr_encode_testrply(xdr, resp);
} }
int
nlmsvc_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 int
nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p) nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
{ {
@@ -359,14 +369,3 @@ nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
*p++ = xdr_zero; /* sequence argument */ *p++ = xdr_zero; /* sequence argument */
return xdr_ressize_check(rqstp, p); return xdr_ressize_check(rqstp, p);
} }
int
nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)
{
struct nlm_res *resp = rqstp->rq_resp;
if (!(p = nlm_encode_cookie(p, &resp->cookie)))
return 0;
*p++ = resp->status;
return xdr_ressize_check(rqstp, p);
}