Commit f4e08f3a authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

lockd: Update the NLMv1 CANCEL 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 c1adb8c6

fs/lockd/xdr.c

+19 −15
Original line number Diff line number Diff line
@@ -293,31 +293,35 @@ nlmsvc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p) 
	return 1;

}



int

nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_res *resp = rqstp->rq_resp;



	if (!(p = nlm_encode_testres(p, resp)))

		return 0;

	return xdr_ressize_check(rqstp, p);

}



int

nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	u32 exclusive;



	if (!(p = nlm_decode_cookie(p, &argp->cookie)))

	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;

	argp->block = ntohl(*p++);

	exclusive = ntohl(*p++);

	if (!(p = nlm_decode_lock(p, &argp->lock)))

	if (!svcxdr_decode_lock(xdr, &argp->lock))

		return 0;

	if (exclusive)

		argp->lock.fl.fl_type = F_WRLCK;

	return xdr_argsize_check(rqstp, p);



	return 1;

}



int

nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_res *resp = rqstp->rq_resp;



	if (!(p = nlm_encode_testres(p, resp)))

		return 0;

	return xdr_ressize_check(rqstp, p);

}



int