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

Commit 590b7431 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: minor read_buf cleanup 



The code to step to the next page seems reasonably self-contained.

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

fs/nfsd/nfs4xdr.c

+14 −10
Original line number Diff line number Diff line
@@ -139,6 +139,19 @@ xdr_error: \ 
	}					\

} while (0)



static void next_decode_page(struct nfsd4_compoundargs *argp)

{

	argp->pagelist++;

	argp->p = page_address(argp->pagelist[0]);

	if (argp->pagelen < PAGE_SIZE) {

		argp->end = argp->p + (argp->pagelen>>2);

		argp->pagelen = 0;

	} else {

		argp->end = argp->p + (PAGE_SIZE>>2);

		argp->pagelen -= PAGE_SIZE;

	}

}



static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes)

{

	/* We want more bytes than seem to be available.
@@ -166,16 +179,7 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes) 
	 * guarantee p points to at least nbytes bytes.

	 */

	memcpy(p, argp->p, avail);

	/* step to next page */

	argp->pagelist++;

	argp->p = page_address(argp->pagelist[0]);

	if (argp->pagelen < PAGE_SIZE) {

		argp->end = argp->p + (argp->pagelen>>2);

		argp->pagelen = 0;

	} else {

		argp->end = argp->p + (PAGE_SIZE>>2);

		argp->pagelen -= PAGE_SIZE;

	}

	next_decode_page(argp);

	memcpy(((char*)p)+avail, argp->p, (nbytes - avail));

	argp->p += XDR_QUADLEN(nbytes - avail);

	return p;