Commit 91e5d765 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/net: un-indent mshot retry path in io_recv_finish() 



In preparation for putting some retry logic in there, have the done
path just skip straight to the end rather than have too much nesting
in here.

No functional changes in this patch.

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

io_uring/net.c

+20 −16
Original line number Diff line number Diff line
@@ -645,13 +645,18 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret, 
		return true;

	}



	if (!mshot_finished) {

	if (mshot_finished)

		goto finish;



	/*

	 * Fill CQE for this receive and see if we should keep trying to

	 * receive from this socket.

	 */

	if (io_fill_cqe_req_aux(req, issue_flags & IO_URING_F_COMPLETE_DEFER,

				*ret, cflags | IORING_CQE_F_MORE)) {

		io_recv_prep_retry(req);

		/* Known not-empty or unknown state, retry */

			if (cflags & IORING_CQE_F_SOCK_NONEMPTY ||

			    msg->msg_inq == -1)

		if (cflags & IORING_CQE_F_SOCK_NONEMPTY || msg->msg_inq == -1)

			return false;

		if (issue_flags & IO_URING_F_MULTISHOT)

			*ret = IOU_ISSUE_SKIP_COMPLETE;
@@ -660,8 +665,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret, 
		return true;

	}

	/* Otherwise stop multishot but use the current result. */

	}



finish:

	io_req_set_res(req, *ret, cflags);



	if (issue_flags & IO_URING_F_MULTISHOT)