diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-12-04 18:47:50 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-12-05 11:57:37 +0100 |
| commit | 9fd7874c0e5c89d7da0b4442271696ec0f8edcba (patch) | |
| tree | 02f05ac2574b38dcc3b39a942c34c0d4b04c29f7 /drivers/block | |
| parent | iov_iter: remove unused 'iov' argument from import_single_range() (diff) | |
| download | linux-9fd7874c0e5c89d7da0b4442271696ec0f8edcba.tar.xz linux-9fd7874c0e5c89d7da0b4442271696ec0f8edcba.zip | |
iov_iter: replace import_single_range() with import_ubuf()
With the removal of the 'iov' argument to import_single_range(), the two
functions are now fully identical. Convert the import_single_range()
callers to import_ubuf(), and remove the former fully.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/20231204174827.1258875-3-axboe@kernel.dk
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ublk_drv.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 5656b0a1233d..3eaf02ebeebe 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -895,9 +895,7 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req, struct iov_iter iter; const int dir = ITER_DEST; - import_single_range(dir, u64_to_user_ptr(io->addr), rq_bytes, - &iter); - + import_ubuf(dir, u64_to_user_ptr(io->addr), rq_bytes, &iter); return ublk_copy_user_pages(req, 0, &iter, dir); } return rq_bytes; @@ -918,8 +916,7 @@ static int ublk_unmap_io(const struct ublk_queue *ubq, WARN_ON_ONCE(io->res > rq_bytes); - import_single_range(dir, u64_to_user_ptr(io->addr), io->res, - &iter); + import_ubuf(dir, u64_to_user_ptr(io->addr), io->res, &iter); return ublk_copy_user_pages(req, 0, &iter, dir); } return rq_bytes; |