Commit 310d9d5a authored by Al Viro's avatar Al Viro

expand those iov_iter_advance()...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 746de1f8
...@@ -1378,7 +1378,8 @@ static ssize_t iter_xarray_get_pages(struct iov_iter *i, ...@@ -1378,7 +1378,8 @@ static ssize_t iter_xarray_get_pages(struct iov_iter *i,
return 0; return 0;
maxsize = min_t(size_t, nr * PAGE_SIZE - offset, maxsize); maxsize = min_t(size_t, nr * PAGE_SIZE - offset, maxsize);
iov_iter_advance(i, maxsize); i->iov_offset += maxsize;
i->count -= maxsize;
return maxsize; return maxsize;
} }
...@@ -1467,7 +1468,13 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i, ...@@ -1467,7 +1468,13 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i,
for (int k = 0; k < n; k++) for (int k = 0; k < n; k++)
get_page(p[k] = page + k); get_page(p[k] = page + k);
maxsize = min_t(size_t, maxsize, n * PAGE_SIZE - *start); maxsize = min_t(size_t, maxsize, n * PAGE_SIZE - *start);
iov_iter_advance(i, maxsize); i->count -= maxsize;
i->iov_offset += maxsize;
if (i->iov_offset == i->bvec->bv_len) {
i->iov_offset = 0;
i->bvec++;
i->nr_segs--;
}
return maxsize; return maxsize;
} }
if (iov_iter_is_pipe(i)) if (iov_iter_is_pipe(i))
......
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