Commit 3049e974 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields

lockd: Update the NLMv4 FREE_ALL arguments decoder to use struct xdr_stream

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 7cf96b6d
...@@ -309,6 +309,21 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) ...@@ -309,6 +309,21 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)
return 1; return 1;
} }
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 int
nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p) nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
{ {
...@@ -342,19 +357,6 @@ nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p) ...@@ -342,19 +357,6 @@ nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p)
return xdr_ressize_check(rqstp, p); return xdr_ressize_check(rqstp, 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 int
nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p) nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment