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

Commit 6ff9897d authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: minor encode_read cleanup 



Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 4f0cefbf

fs/nfsd/nfs4xdr.c

+6 −4
Original line number Diff line number Diff line
@@ -3076,18 +3076,20 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, 


	len = maxcount;

	v = 0;

	while (len > 0) {

	while (len) {

		int thislen;



		page = *(resp->rqstp->rq_next_page);

		if (!page) { /* ran out of pages */

			maxcount -= len;

			break;

		}

		thislen = min_t(long, len, PAGE_SIZE);

		resp->rqstp->rq_vec[v].iov_base = page_address(page);

		resp->rqstp->rq_vec[v].iov_len =

			len < PAGE_SIZE ? len : PAGE_SIZE;

		resp->rqstp->rq_vec[v].iov_len = thislen;

		resp->rqstp->rq_next_page++;

		v++;

		len -= PAGE_SIZE;

		len -= thislen;

	}

	read->rd_vlen = v;