Commit 1ef255e2 authored by Al Viro's avatar Al Viro
Browse files

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: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3cf42da3

drivers/vhost/scsi.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

fs/ceph/file.c

+1 −2
Original line number Diff line number Diff line
@@ -95,12 +95,11 @@ static ssize_t __iter_get_bvecs(struct iov_iter *iter, size_t maxsize, 
		size_t start;

		int idx = 0;



		bytes = iov_iter_get_pages(iter, pages, maxsize - size,

		bytes = iov_iter_get_pages2(iter, pages, maxsize - size,

					   ITER_GET_BVECS_PAGES, &start);

		if (bytes < 0)

			return size ?: bytes;



		iov_iter_advance(iter, bytes);

		size += bytes;



		for ( ; bytes; idx++, bvec_idx++) {

fs/cifs/file.c

+2 −4
Original line number Diff line number Diff line
@@ -3022,7 +3022,7 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, 
		if (ctx->direct_io) {

			ssize_t result;



			result = iov_iter_get_pages_alloc(

			result = iov_iter_get_pages_alloc2(

				from, &pagevec, cur_len, &start);

			if (result < 0) {

				cifs_dbg(VFS,
@@ -3036,7 +3036,6 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, 
				break;

			}

			cur_len = (size_t)result;

			iov_iter_advance(from, cur_len);



			nr_pages =

				(cur_len + start + PAGE_SIZE - 1) / PAGE_SIZE;
@@ -3758,7 +3757,7 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file, 
		if (ctx->direct_io) {

			ssize_t result;



			result = iov_iter_get_pages_alloc(

			result = iov_iter_get_pages_alloc2(

					&direct_iov, &pagevec,

					cur_len, &start);

			if (result < 0) {
@@ -3774,7 +3773,6 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file, 
				break;

			}

			cur_len = (size_t)result;

			iov_iter_advance(&direct_iov, cur_len);



			rdata = cifs_readdata_direct_alloc(

					pagevec, cifs_uncached_readv_complete);

fs/cifs/misc.c

+1 −2
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ setup_aio_ctx_iter(struct cifs_aio_ctx *ctx, struct iov_iter *iter, int rw) 
	saved_len = count;



	while (count && npages < max_pages) {

		rc = iov_iter_get_pages(iter, pages, count, max_pages, &start);

		rc = iov_iter_get_pages2(iter, pages, count, max_pages, &start);

		if (rc < 0) {

			cifs_dbg(VFS, "Couldn't get user pages (rc=%zd)\n", rc);

			break;
@@ -1041,7 +1041,6 @@ setup_aio_ctx_iter(struct cifs_aio_ctx *ctx, struct iov_iter *iter, int rw) 
			break;

		}



		iov_iter_advance(iter, rc);

		count -= rc;

		rc += start;

		cur_npages = DIV_ROUND_UP(rc, PAGE_SIZE);

fs/direct-io.c

+1 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio) 
	const enum req_op dio_op = dio->opf & REQ_OP_MASK;

	ssize_t ret;



	ret = iov_iter_get_pages(sdio->iter, dio->pages, LONG_MAX, DIO_PAGES,

	ret = iov_iter_get_pages2(sdio->iter, dio->pages, LONG_MAX, DIO_PAGES,

				&sdio->from);



	if (ret < 0 && sdio->blocks_available && dio_op == REQ_OP_WRITE) {
@@ -191,7 +191,6 @@ static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio) 
	}



	if (ret >= 0) {

		iov_iter_advance(sdio->iter, ret);

		ret += sdio->from;

		sdio->head = 0;

		sdio->tail = (ret + PAGE_SIZE - 1) / PAGE_SIZE;