Commit 0d63c148 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: simplify __io_queue_sqe() 



Restructure __io_queue_sqe() so it follows simple if/else if/else
control flow. It's more readable and removes extra goto/labels.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9aaf3543

fs/io_uring.c

+11 −17
Original line number Diff line number Diff line
@@ -6162,7 +6162,6 @@ static struct io_kiocb *io_prep_linked_timeout(struct io_kiocb *req) 
static void __io_queue_sqe(struct io_kiocb *req, struct io_comp_state *cs)

{

	struct io_kiocb *linked_timeout;

	struct io_kiocb *nxt;

	const struct cred *old_creds = NULL;

	int ret;
@@ -6197,30 +6196,25 @@ again: 


		if (linked_timeout)

			io_queue_linked_timeout(linked_timeout);

		goto exit;

	}



	if (unlikely(ret)) {

		/* un-prep timeout, so it'll be killed as any other linked */

		req->flags &= ~REQ_F_LINK_TIMEOUT;

		req_set_fail_links(req);

		io_put_req(req);

		io_req_complete(req, ret);

		goto exit;

	}



	} else if (likely(!ret)) {

		/* drop submission reference */

	nxt = io_put_req_find_next(req);

		req = io_put_req_find_next(req);

		if (linked_timeout)

			io_queue_linked_timeout(linked_timeout);



	if (nxt) {

		req = nxt;

		if (req) {

			if (!(req->flags & REQ_F_FORCE_ASYNC))

				goto again;

			io_queue_async_work(req);

		}

exit:

	} else {

		/* un-prep timeout, so it'll be killed as any other linked */

		req->flags &= ~REQ_F_LINK_TIMEOUT;

		req_set_fail_links(req);

		io_put_req(req);

		io_req_complete(req, ret);

	}



	if (old_creds)

		revert_creds(old_creds);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE