diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2022-06-09 10:28:36 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2022-08-08 22:37:22 -0400 |
| commit | 1ef255e257173f4bc44317ef2076e7e0de688fdf (patch) | |
| tree | 700be64ef5aa70a34f6d8158936214e9694e4245 /drivers/vhost/scsi.c | |
| parent | 3cf42da327f26eb4461864dd64812345b37f4fd9 (diff) | |
| download | linux-riscv-1ef255e257173f4bc44317ef2076e7e0de688fdf.tar.gz linux-riscv-1ef255e257173f4bc44317ef2076e7e0de688fdf.tar.bz2 linux-riscv-1ef255e257173f4bc44317ef2076e7e0de688fdf.zip | |
iov_iter: advancing variants of iov_iter_get_pages{,_alloc}()
Most of the users immediately follow successful iov_iter_get_pages()
with advancing by the amount it had returned.
Provide inline wrappers doing that, convert trivial open-coded
uses of those.
BTW, iov_iter_get_pages() never returns more than it had been asked
to; such checks in cifs ought to be removed someday...
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/vhost/scsi.c')
| -rw-r--r-- | drivers/vhost/scsi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index ffd9e6c2ffc1..9b65509424dc 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -643,14 +643,12 @@ vhost_scsi_map_to_sgl(struct vhost_scsi_cmd *cmd, size_t offset; unsigned int npages = 0; - bytes = iov_iter_get_pages(iter, pages, LONG_MAX, + bytes = iov_iter_get_pages2(iter, pages, LONG_MAX, VHOST_SCSI_PREALLOC_UPAGES, &offset); /* No pages were pinned */ if (bytes <= 0) return bytes < 0 ? bytes : -EFAULT; - iov_iter_advance(iter, bytes); - while (bytes) { unsigned n = min_t(unsigned, PAGE_SIZE - offset, bytes); sg_set_page(sg++, pages[npages++], n, offset); |