diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2021-06-03 16:53:04 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2021-07-06 20:14:44 -0400 |
| commit | 3049e974a7c7cfa0c15fb807f4a3e75b2ab8517a (patch) | |
| tree | 325a38c53e95b6b981eee5bd1912c9d8b963f255 /fs | |
| parent | 7cf96b6d0104b12aa30961901879e428884b1695 (diff) | |
lockd: Update the NLMv4 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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/lockd/xdr4.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index e6bab1d1e41f..6c5383bef2bf 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c @@ -310,6 +310,21 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) } int +nlm4svc_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 nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p) { struct nlm_res *resp = rqstp->rq_resp; @@ -343,19 +358,6 @@ nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p) } int -nlm4svc_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 nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p) { return xdr_ressize_check(rqstp, p); |