Commit 515e2696 authored by Dylan Yudaken's avatar Dylan Yudaken Committed by Jens Axboe
Browse files

io_uring: revert "io_uring fix multishot accept ordering" 



This is no longer needed after commit aa1df3a3 ("io_uring: fix CQE
reordering"), since all reordering is now taken care of.

This reverts commit cbd25748 ("io_uring: fix multishot accept
ordering").

Signed-off-by: default avatarDylan Yudaken <dylany@meta.com>
Link: https://lore.kernel.org/r/20221107125236.260132-2-dylany@meta.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ef67fcb4

io_uring/net.c

+4 −4
Original line number Diff line number Diff line
@@ -1322,12 +1322,12 @@ 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);

	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)