Commit 746de1f8 authored by Al Viro's avatar Al Viro

pipe_get_pages(): switch to append_pipe()

now that we are advancing the iterator, there's no need to
treat the first page separately - just call append_pipe()
in a loop.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent eba2d3d7
...@@ -1304,10 +1304,9 @@ static ssize_t pipe_get_pages(struct iov_iter *i, ...@@ -1304,10 +1304,9 @@ static ssize_t pipe_get_pages(struct iov_iter *i,
struct page ***pages, size_t maxsize, unsigned maxpages, struct page ***pages, size_t maxsize, unsigned maxpages,
size_t *start) size_t *start)
{ {
struct pipe_inode_info *pipe = i->pipe; unsigned int npages, count, off, chunk;
unsigned int npages, off, count;
struct page **p; struct page **p;
ssize_t left; size_t left;
if (!sanity(i)) if (!sanity(i))
return -EFAULT; return -EFAULT;
...@@ -1319,38 +1318,16 @@ static ssize_t pipe_get_pages(struct iov_iter *i, ...@@ -1319,38 +1318,16 @@ static ssize_t pipe_get_pages(struct iov_iter *i,
if (!count) if (!count)
return -ENOMEM; return -ENOMEM;
p = *pages; p = *pages;
left = maxsize; for (npages = 0, left = maxsize ; npages < count; npages++, left -= chunk) {
npages = 0; struct page *page = append_pipe(i, left, &off);
if (off) {
struct pipe_buffer *buf = pipe_buf(pipe, pipe->head - 1);
get_page(*p++ = buf->page);
left -= PAGE_SIZE - off;
if (left <= 0) {
buf->len += maxsize;
iov_iter_advance(i, maxsize);
return maxsize;
}
buf->len = PAGE_SIZE;
npages = 1;
}
for ( ; npages < count; npages++) {
struct page *page;
unsigned int size = min_t(ssize_t, left, PAGE_SIZE);
if (pipe_full(pipe->head, pipe->tail, pipe->max_usage))
break;
page = push_anon(pipe, size);
if (!page) if (!page)
break; break;
chunk = min_t(size_t, left, PAGE_SIZE - off);
get_page(*p++ = page); get_page(*p++ = page);
left -= size;
} }
if (!npages) if (!npages)
return -EFAULT; return -EFAULT;
maxsize -= left; return maxsize - left;
iov_iter_advance(i, maxsize);
return maxsize;
} }
static ssize_t iter_xarray_populate_pages(struct page **pages, struct xarray *xa, static ssize_t iter_xarray_populate_pages(struct page **pages, struct xarray *xa,
......
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