diff mbox series

[for-next,1/4] io_uring: revert "io_uring fix multishot accept ordering"

Message ID 20221107125236.260132-2-dylany@meta.com (mailing list archive)
State New
Headers show
Series io_uring: cleanup allow_overflow on post_cqe | expand

Commit Message

Dylan Yudaken Nov. 7, 2022, 12:52 p.m. UTC 
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>
---
 io_uring/net.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/io_uring/net.c b/io_uring/net.c
index 9a07e79cc0e6..0d77ddcce0af 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -1325,14 +1325,11 @@  int io_accept(struct io_kiocb *req, unsigned int issue_flags)
 		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);
-	if (req->flags & REQ_F_POLLED)
-		return IOU_STOP_MULTISHOT;
-	return IOU_OK;
+	return -ECANCELED;
 }
 
 int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)