torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

io_uring/rw: open code io_prep_rw_setup()

Browse Source 
Open code io_prep_rw_setup() into its only caller, it doesn't provide
any meaningful abstraction anymore.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/61ba72e2d46119db71f27ab908018e6a6cd6c064.1740425922.git.asml.silence@gmail.com
[axboe: fold in 'ret' being unused fix]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov
2025-02-24 19:45:06 +00:00
committed by Jens Axboe
parent 99fab04778
commit 7a9b0d6925
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
io_uring/rw.c
View File

@@ -204,17 +204,6 @@ static int io_rw_alloc_async(struct io_kiocb *req)
return 0;
}
static int io_prep_rw_setup(struct io_kiocb *req, int ddir, bool do_import)
{
struct io_async_rw *rw;
if (!do_import || io_do_buffer_select(req))
return 0;
rw = req->async_data;
return io_import_rw_buffer(ddir, req, rw, 0);
}
static inline void io_meta_save_state(struct io_async_rw *io)
{
io->meta_state.seed = io->meta.seed;
@@ -287,10 +276,14 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe,
rw->addr = READ_ONCE(sqe->addr);
rw->len = READ_ONCE(sqe->len);
rw->flags = READ_ONCE(sqe->rw_flags);
ret = io_prep_rw_setup(req, ddir, do_import);
if (unlikely(ret))
return ret;
if (do_import && !io_do_buffer_select(req)) {
struct io_async_rw *io = req->async_data;
ret = io_import_rw_buffer(ddir, req, io, 0);
if (unlikely(ret))
return ret;
}
attr_type_mask = READ_ONCE(sqe->attr_type_mask);
if (attr_type_mask) {
@@ -301,9 +294,9 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe,
return -EINVAL;
attr_ptr = READ_ONCE(sqe->attr_ptr);
ret = io_prep_rw_pi(req, rw, ddir, attr_ptr, attr_type_mask);
return io_prep_rw_pi(req, rw, ddir, attr_ptr, attr_type_mask);
}
return ret;
return 0;
}
int io_prep_read(struct io_kiocb *req, const struct io_uring_sqe *sqe)