Commit 2a51c327 authored by Bui Quang Minh's avatar Bui Quang Minh Committed by Jens Axboe
Browse files

io_uring/rsrc: simplify the bvec iter count calculation 



As we don't use iov_iter_advance() but our own logic in io_import_fixed(),
we can remove the logic that over-sets the iter's count to len + offset
then adjusts it later to len. This helps to make the code cleaner.

Signed-off-by: default avatarBui Quang Minh <minhquangbui99@gmail.com>
Link: https://lore.kernel.org/r/20250103150412.12549-1-minhquangbui99@gmail.com


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

io_uring/rsrc.c

+1 −3
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ int io_import_fixed(int ddir, struct iov_iter *iter, 
	 * and advance us to the beginning.

	 */

	offset = buf_addr - imu->ubuf;

	iov_iter_bvec(iter, ddir, imu->bvec, imu->nr_bvecs, offset + len);

	iov_iter_bvec(iter, ddir, imu->bvec, imu->nr_bvecs, len);



	if (offset) {

		/*
@@ -904,7 +904,6 @@ int io_import_fixed(int ddir, struct iov_iter *iter, 
		const struct bio_vec *bvec = imu->bvec;



		if (offset < bvec->bv_len) {

			iter->count -= offset;

			iter->iov_offset = offset;

		} else {

			unsigned long seg_skip;
@@ -915,7 +914,6 @@ int io_import_fixed(int ddir, struct iov_iter *iter, 


			iter->bvec += seg_skip;

			iter->nr_segs -= seg_skip;

			iter->count -= bvec->bv_len + offset;

			iter->iov_offset = offset & ((1UL << imu->folio_shift) - 1);

		}

	}