Commit de4f5fed authored by Jens Axboe's avatar Jens Axboe
Browse files

iov_iter: add iter_iovec() helper 



This returns a pointer to the current iovec entry in the iterator. Only
useful with ITER_IOVEC right now, but it prepares us to treat ITER_UBUF
and ITER_IOVEC identically for the first segment.

Rename struct iov_iter->iov to iov_iter->__iov to find any potentially
troublesome spots, and also to prevent anyone from adding new code that
accesses iter->iov directly.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0a2481cd

block/blk-map.c

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ static struct bio_map_data *bio_alloc_map_data(struct iov_iter *data, 
		return NULL;

	bmd->iter = *data;

	if (iter_is_iovec(data)) {

		memcpy(bmd->iov, data->iov, sizeof(struct iovec) * data->nr_segs);

		bmd->iter.iov = bmd->iov;

		memcpy(bmd->iov, iter_iov(data), sizeof(struct iovec) * data->nr_segs);

		bmd->iter.__iov = bmd->iov;

	}

	return bmd;

}

drivers/infiniband/hw/hfi1/file_ops.c

+2 −1
Original line number Diff line number Diff line
@@ -287,11 +287,12 @@ static ssize_t hfi1_write_iter(struct kiocb *kiocb, struct iov_iter *from) 
	}



	while (dim) {

		const struct iovec *iov = iter_iov(from);

		int ret;

		unsigned long count = 0;



		ret = hfi1_user_sdma_process_request(

			fd, (struct iovec *)(from->iov + done),

			fd, (struct iovec *)(iov + done),

			dim, &count);

		if (ret) {

			reqs = ret;

drivers/infiniband/hw/qib/qib_file_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -2248,7 +2248,7 @@ static ssize_t qib_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (!iter_is_iovec(from) || !from->nr_segs || !pq)

		return -EINVAL;



	return qib_user_sdma_writev(rcd, pq, from->iov, from->nr_segs);

	return qib_user_sdma_writev(rcd, pq, iter_iov(from), from->nr_segs);

}



static struct class *qib_class;

drivers/net/tun.c

+2 −1
Original line number Diff line number Diff line
@@ -1486,7 +1486,8 @@ static struct sk_buff *tun_napi_alloc_frags(struct tun_file *tfile, 
	skb->truesize += skb->data_len;



	for (i = 1; i < it->nr_segs; i++) {

		size_t fragsz = it->iov[i].iov_len;

		const struct iovec *iov = iter_iov(it);

		size_t fragsz = iov->iov_len;

		struct page *page;

		void *frag;

drivers/vhost/scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ vhost_scsi_calc_sgls(struct iov_iter *iter, size_t bytes, int max_sgls) 
{

	int sgl_count = 0;



	if (!iter || !iter->iov) {

	if (!iter || !iter_iov(iter)) {

		pr_err("%s: iter->iov is NULL, but expected bytes: %zu"

		       " present\n", __func__, bytes);

		return -EINVAL;