Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35e13333 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Greg Kroah-Hartman
Browse files

nfsd4: minor NFSv2/v3 write decoding cleanup 



commit db44bac41bbfc0c0d9dd943092d8bded3c9db19b upstream.

Use a couple shortcuts that will simplify a following bugfix.

(Minor backporting required to account for a change from f34b9568
"The NFSv2/NFSv3 server does not handle zero length WRITE requests
correctly".)

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16fb859f

fs/nfsd/nfs3xdr.c

+4 −4
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, 
{

	unsigned int len, v, hdr, dlen;

	u32 max_blocksize = svc_max_payload(rqstp);

	struct kvec *head = rqstp->rq_arg.head;



	p = decode_fh(p, &args->fh);

	if (!p)
@@ -377,9 +378,8 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, 
	 * Check to make sure that we got the right number of

	 * bytes.

	 */

	hdr = (void*)p - rqstp->rq_arg.head[0].iov_base;

	dlen = rqstp->rq_arg.head[0].iov_len + rqstp->rq_arg.page_len

		- hdr;

	hdr = (void*)p - head->iov_base;

	dlen = head->iov_len + rqstp->rq_arg.page_len - hdr;

	/*

	 * Round the length of the data which was specified up to

	 * the next multiple of XDR units and then compare that
@@ -396,7 +396,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, 
		len = args->len = max_blocksize;

	}

	rqstp->rq_vec[0].iov_base = (void*)p;

	rqstp->rq_vec[0].iov_len = rqstp->rq_arg.head[0].iov_len - hdr;

	rqstp->rq_vec[0].iov_len = head->iov_len - hdr;

	v = 0;

	while (len > rqstp->rq_vec[v].iov_len) {

		len -= rqstp->rq_vec[v].iov_len;

fs/nfsd/nfsxdr.c

+4 −4
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, 
					struct nfsd_writeargs *args)

{

	unsigned int len, hdr, dlen;

	struct kvec *head = rqstp->rq_arg.head;

	int v;



	p = decode_fh(p, &args->fh);
@@ -300,9 +301,8 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, 
	 * Check to make sure that we got the right number of

	 * bytes.

	 */

	hdr = (void*)p - rqstp->rq_arg.head[0].iov_base;

	dlen = rqstp->rq_arg.head[0].iov_len + rqstp->rq_arg.page_len

		- hdr;

	hdr = (void*)p - head->iov_base;

	dlen = head->iov_len + rqstp->rq_arg.page_len - hdr;



	/*

	 * Round the length of the data which was specified up to
@@ -316,7 +316,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, 
		return 0;



	rqstp->rq_vec[0].iov_base = (void*)p;

	rqstp->rq_vec[0].iov_len = rqstp->rq_arg.head[0].iov_len - hdr;

	rqstp->rq_vec[0].iov_len = head->iov_len - hdr;

	v = 0;

	while (len > rqstp->rq_vec[v].iov_len) {

		len -= rqstp->rq_vec[v].iov_len;