| Message ID | 20221107125236.260132-3-dylany@meta.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | io_uring: cleanup allow_overflow on post_cqe | expand |
diff --git a/io_uring/poll.c b/io_uring/poll.c index 589b60fc740a..e1b8652b670f 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -244,10 +244,8 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked) req->apoll_events); if (!io_post_aux_cqe(ctx, req->cqe.user_data, - mask, IORING_CQE_F_MORE, false)) { - io_req_set_res(req, mask, 0); - return IOU_POLL_REMOVE_POLL_USE_RES; - } + mask, IORING_CQE_F_MORE, true)) + return -ECANCELED; } else { ret = io_poll_issue(req, locked); if (ret == IOU_STOP_MULTISHOT)
This is no longer needed after commit aa1df3a360a0 ("io_uring: fix CQE reordering"), since all reordering is now taken care of. This reverts commit a2da676376fe ("io_uring: fix multishot poll on overflow"). Signed-off-by: Dylan Yudaken <dylany@meta.com> --- io_uring/poll.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)