iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Chuck Lever 2021-06-03 16:52:28 -04:00 committed by J. Bruce Fields
parent 345b4159a0
commit 0e5977af4f
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
fs/lockd/xdr4.c
View File

@ -264,6 +264,32 @@ nlm4svc_decode_testargs(struct svc_rqst *rqstp, __be32 *p)
return 1;
}
int
nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p)
{
struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nlm_args *argp = rqstp->rq_argp;
u32 exclusive;
if (!svcxdr_decode_cookie(xdr, &argp->cookie))
return 0;
if (xdr_stream_decode_bool(xdr, &argp->block) < 0)
return 0;
if (xdr_stream_decode_bool(xdr, &exclusive) < 0)
return 0;
if (!svcxdr_decode_lock(xdr, &argp->lock))
return 0;
if (exclusive)
argp->lock.fl.fl_type = F_WRLCK;
if (xdr_stream_decode_bool(xdr, &argp->reclaim) < 0)
return 0;
if (xdr_stream_decode_u32(xdr, &argp->state) < 0)
return 0;
argp->monitor = 1; /* monitor client by default */
return 1;
}
int
nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
{
@ -274,27 +300,6 @@ nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
return xdr_ressize_check(rqstp, p);
}
int
nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p)
{
struct nlm_args *argp = rqstp->rq_argp;
u32 exclusive;
if (!(p = nlm4_decode_cookie(p, &argp->cookie)))
return 0;
argp->block = ntohl(*p++);
exclusive = ntohl(*p++);
if (!(p = nlm4_decode_lock(p, &argp->lock)))
return 0;
if (exclusive)
argp->lock.fl.fl_type = F_WRLCK;
argp->reclaim = ntohl(*p++);
argp->state = ntohl(*p++);
argp->monitor = 1; /* monitor client by default */
return xdr_argsize_check(rqstp, p);
}
int
nlm4svc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p)
{