korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-20 04:44:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITER_PIPE: lose iter_head argument of __pipe_get_pages()

Browse Source 
it's only used to get to the partial buffer we can add to,
and that's always the last one, i.e. pipe->head - 1.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2022-06-16 14:26:23 -04:00
parent e3b42964f8
commit ca59196754
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/iov_iter.c
View File

@ -1318,14 +1318,13 @@ EXPORT_SYMBOL(iov_iter_gap_alignment);
static inline ssize_t __pipe_get_pages(struct iov_iter *i,
size_t maxsize,
struct page **pages,
int iter_head,
size_t off)
{
struct pipe_inode_info *pipe = i->pipe;
ssize_t left = maxsize;
if (off) {
struct pipe_buffer *buf = pipe_buf(pipe, iter_head);
struct pipe_buffer *buf = pipe_buf(pipe, pipe->head - 1);
get_page(*pages++ = buf->page);
left -= PAGE_SIZE - off;
@ -1363,7 +1362,7 @@ static ssize_t pipe_get_pages(struct iov_iter *i,
npages = pipe_space_for_user(iter_head, i->pipe->tail, i->pipe);
capacity = min(npages, maxpages) * PAGE_SIZE - *start;
return __pipe_get_pages(i, min(maxsize, capacity), pages, iter_head, *start);
return __pipe_get_pages(i, min(maxsize, capacity), pages, *start);
}
static ssize_t iter_xarray_populate_pages(struct page **pages, struct xarray *xa,
@ -1545,7 +1544,7 @@ static ssize_t pipe_get_pages_alloc(struct iov_iter *i,
p = get_pages_array(npages);
if (!p)
return -ENOMEM;
n = __pipe_get_pages(i, maxsize, p, iter_head, *start);
n = __pipe_get_pages(i, maxsize, p, *start);
if (n > 0)
*pages = p;
else