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

lockd: Update the NLMv1 nlm_res results encoder 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 adf98a48

fs/lockd/xdr.c

+6 −7
Original line number Diff line number Diff line
@@ -349,24 +349,23 @@ nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)

{

	struct xdr_stream *xdr = &rqstp->rq_res_stream;

	struct nlm_res *resp = rqstp->rq_resp;



	if (!(p = nlm_encode_cookie(p, &resp->cookie)))

		return 0;

	*p++ = resp->status;

	*p++ = xdr_zero;		/* sequence argument */

	return xdr_ressize_check(rqstp, p);

	return svcxdr_encode_cookie(xdr, &resp->cookie) &&

		svcxdr_encode_stats(xdr, resp->status);

}



int

nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_res *resp = rqstp->rq_resp;



	if (!(p = nlm_encode_cookie(p, &resp->cookie)))

		return 0;

	*p++ = resp->status;

	*p++ = xdr_zero;		/* sequence argument */

	return xdr_ressize_check(rqstp, p);

}