diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2021-06-03 22:51:28 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2021-07-07 02:14:42 +0200 |
| commit | 16ddcabe6240c4fb01c97f6fce6c35ddf8626ad5 (patch) | |
| tree | 228a27bbb8f655c29aa108cdf7e03871c9560202 /fs/lockd | |
| parent | lockd: Update the NLMv1 UNLOCK arguments decoder to use struct xdr_stream (diff) | |
| download | linux-16ddcabe6240c4fb01c97f6fce6c35ddf8626ad5.tar.xz linux-16ddcabe6240c4fb01c97f6fce6c35ddf8626ad5.zip | |
lockd: Update the NLMv1 nlm_res arguments decoder 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, 14 insertions, 11 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index b59e02b4417c..911b6377a6da 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c @@ -300,6 +300,20 @@ nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p) } int +nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p) +{ + struct xdr_stream *xdr = &rqstp->rq_arg_stream; + struct nlm_res *resp = rqstp->rq_argp; + + if (!svcxdr_decode_cookie(xdr, &resp->cookie)) + return 0; + if (!svcxdr_decode_stats(xdr, &resp->status)) + return 0; + + return 1; +} + +int nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p) { struct nlm_res *resp = rqstp->rq_resp; @@ -380,17 +394,6 @@ nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p) } int -nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p) -{ - struct nlm_res *resp = rqstp->rq_argp; - - if (!(p = nlm_decode_cookie(p, &resp->cookie))) - return 0; - resp->status = *p++; - return xdr_argsize_check(rqstp, p); -} - -int nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p) { return xdr_ressize_check(rqstp, p); |