diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2021-06-03 23:51:46 +0300 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2021-07-07 03:14:43 +0300 |
| commit | 14e105256b9dcdf50a003e2e9a0da77e06770a4b (patch) | |
| tree | aa78ee10c8343436f352a4dbbef735ac21f83262 | |
| parent | 890939e1266b9adf3b0acd5e0385b39813cb8f11 (diff) | |
| download | linux-14e105256b9dcdf50a003e2e9a0da77e06770a4b.tar.xz | |
lockd: Update the NLMv1 FREE_ALL 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>
| -rw-r--r-- | fs/lockd/xdr.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index c496f18eff06..091c8c463ab4 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c @@ -317,6 +317,21 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) } int +nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p) +{ + struct xdr_stream *xdr = &rqstp->rq_arg_stream; + struct nlm_args *argp = rqstp->rq_argp; + struct nlm_lock *lock = &argp->lock; + + if (!svcxdr_decode_string(xdr, &lock->caller, &lock->len)) + return 0; + if (xdr_stream_decode_u32(xdr, &argp->state) < 0) + return 0; + + return 1; +} + +int nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p) { struct nlm_res *resp = rqstp->rq_resp; @@ -350,19 +365,6 @@ nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p) } int -nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p) -{ - struct nlm_args *argp = rqstp->rq_argp; - struct nlm_lock *lock = &argp->lock; - - if (!(p = xdr_decode_string_inplace(p, &lock->caller, - &lock->len, NLM_MAXSTRLEN))) - return 0; - argp->state = ntohl(*p++); - return xdr_argsize_check(rqstp, p); -} - -int nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p) { return xdr_ressize_check(rqstp, p); |