diff options
| author | Dylan Yudaken <dylany@meta.com> | 2022-11-21 15:43:42 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-11-21 15:43:42 +0100 |
| commit | 515e26961295bee9da5e26916c27739dca6c10e1 (patch) | |
| tree | 76b82127e5e3bc394bbddf9e915e03003f803197 /io_uring/net.c | |
| parent | io_uring: do not always force run task_work in io_uring_register (diff) | |
| download | linux-515e26961295bee9da5e26916c27739dca6c10e1.tar.xz linux-515e26961295bee9da5e26916c27739dca6c10e1.zip | |
io_uring: revert "io_uring fix multishot accept ordering"
This is no longer needed after commit aa1df3a360a0 ("io_uring: fix CQE
reordering"), since all reordering is now taken care of.
This reverts commit cbd25748545c ("io_uring: fix multishot accept
ordering").
Signed-off-by: Dylan Yudaken <dylany@meta.com>
Link: https://lore.kernel.org/r/20221107125236.260132-2-dylany@meta.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/net.c')
| -rw-r--r-- | io_uring/net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index f32e0daeedd8..f7b2b068464d 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -1322,12 +1322,12 @@ retry: return IOU_OK; } - if (ret >= 0 && - io_post_aux_cqe(ctx, req->cqe.user_data, ret, IORING_CQE_F_MORE, false)) + if (ret < 0) + return ret; + if (io_post_aux_cqe(ctx, req->cqe.user_data, ret, IORING_CQE_F_MORE, true)) goto retry; - io_req_set_res(req, ret, 0); - return (issue_flags & IO_URING_F_MULTISHOT) ? IOU_STOP_MULTISHOT : IOU_OK; + return -ECANCELED; } int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) |