diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2025-02-19 01:33:40 +0000 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2025-02-19 13:42:22 -0700 |
| commit | 4614de748e78a295ee9b1f54ca87280b101fbdf0 (patch) | |
| tree | 34813eabc005153529e6e8665dc1af92775bb6ad | |
| parent | io_uring/rw: move ki_complete init into prep (diff) | |
| download | wireguard-linux-4614de748e78a295ee9b1f54ca87280b101fbdf0.tar.xz wireguard-linux-4614de748e78a295ee9b1f54ca87280b101fbdf0.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | io_uring/rw.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/io_uring/rw.c b/io_uring/rw.c index d16256505389..9edc6baebd01 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -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); /* |