1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00

io_uring/rw: clean up mshot forced sync mode

Move code forcing synchronous execution of multishot read requests out
a more generic __io_read().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/4ad7b928c776d1ad59addb9fff64ef2d1fc474d5.1739919038.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2025-02-19 01:33:40 +00:00 committed by Jens Axboe
parent 74f3e87526
commit 4614de748e

View file

@ -889,15 +889,7 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags)
if (unlikely(ret))
return ret;
if (unlikely(req->opcode == IORING_OP_READ_MULTISHOT)) {
void *cb_copy = rw->kiocb.ki_complete;
rw->kiocb.ki_complete = NULL;
ret = io_iter_do_read(rw, &io->iter);
rw->kiocb.ki_complete = cb_copy;
} else {
ret = io_iter_do_read(rw, &io->iter);
}
ret = io_iter_do_read(rw, &io->iter);
/*
* Some file systems like to return -EOPNOTSUPP for an IOCB_NOWAIT
@ -995,6 +987,8 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags)
if (!io_file_can_poll(req))
return -EBADFD;
/* make it sync, multishot doesn't support async execution */
rw->kiocb.ki_complete = NULL;
ret = __io_read(req, issue_flags);
/*