diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-03-29 17:52:15 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-03-30 17:12:29 +0300 |
| commit | de4f5fed3f231a8ff4790bf52975f847b95b85ea (patch) | |
| tree | 0f546e08dadb0145ca9347ce3fc2b8936d48c5f6 /io_uring/rw.c | |
| parent | 0a2481cde24f78f503cbc066df2c9c160e64cfd6 (diff) | |
| download | linux-de4f5fed3f231a8ff4790bf52975f847b95b85ea.tar.xz | |
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: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/rw.c')
| -rw-r--r-- | io_uring/rw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/io_uring/rw.c b/io_uring/rw.c index 4c233910e200..7573a34ea42a 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -503,10 +503,10 @@ static void io_req_map_rw(struct io_kiocb *req, const struct iovec *iovec, if (!iovec) { unsigned iov_off = 0; - io->s.iter.iov = io->s.fast_iov; - if (iter->iov != fast_iov) { - iov_off = iter->iov - fast_iov; - io->s.iter.iov += iov_off; + io->s.iter.__iov = io->s.fast_iov; + if (iter->__iov != fast_iov) { + iov_off = iter_iov(iter) - fast_iov; + io->s.iter.__iov += iov_off; } if (io->s.fast_iov != fast_iov) memcpy(io->s.fast_iov + iov_off, fast_iov + iov_off, |