Commit ad3d24c5 authored by Chuck Lever's avatar Chuck Lever Committed by Chuck Lever

SUNRPC: Clean up xdr_write_pages()

Make it more evident how xdr_write_pages() updates the tail buffer
by using the convention of naming the iov pointer variable "tail".
I spent more than a couple of hours chasing through code to
understand this, so someone is likely to find this useful later.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
parent da522b5f
...@@ -1224,30 +1224,34 @@ EXPORT_SYMBOL(xdr_restrict_buflen); ...@@ -1224,30 +1224,34 @@ EXPORT_SYMBOL(xdr_restrict_buflen);
/** /**
* xdr_write_pages - Insert a list of pages into an XDR buffer for sending * xdr_write_pages - Insert a list of pages into an XDR buffer for sending
* @xdr: pointer to xdr_stream * @xdr: pointer to xdr_stream
* @pages: list of pages * @pages: array of pages to insert
* @base: offset of first byte * @base: starting offset of first data byte in @pages
* @len: length of data in bytes * @len: number of data bytes in @pages to insert
* *
* After the @pages are added, the tail iovec is instantiated pointing to
* end of the head buffer, and the stream is set up to encode subsequent
* items into the tail.
*/ */
void xdr_write_pages(struct xdr_stream *xdr, struct page **pages, unsigned int base, void xdr_write_pages(struct xdr_stream *xdr, struct page **pages, unsigned int base,
unsigned int len) unsigned int len)
{ {
struct xdr_buf *buf = xdr->buf; struct xdr_buf *buf = xdr->buf;
struct kvec *iov = buf->tail; struct kvec *tail = buf->tail;
buf->pages = pages; buf->pages = pages;
buf->page_base = base; buf->page_base = base;
buf->page_len = len; buf->page_len = len;
iov->iov_base = (char *)xdr->p; tail->iov_base = xdr->p;
iov->iov_len = 0; tail->iov_len = 0;
xdr->iov = iov; xdr->iov = tail;
if (len & 3) { if (len & 3) {
unsigned int pad = 4 - (len & 3); unsigned int pad = 4 - (len & 3);
BUG_ON(xdr->p >= xdr->end); BUG_ON(xdr->p >= xdr->end);
iov->iov_base = (char *)xdr->p + (len & 3); tail->iov_base = (char *)xdr->p + (len & 3);
iov->iov_len += pad; tail->iov_len += pad;
len += pad; len += pad;
*xdr->p++ = 0; *xdr->p++ = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment