Commit 7012c815 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: refactor io_req_task_complete() 



Clean up io_req_task_complete() and deduplicate io_put_kbuf() calls.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/ae3148ac7eb5cce3e06895cde306e9e959d6f6ae.1655371007.git.asml.silence@gmail.com


Reviewed-by: default avatarHao Xu <howeyxu@tencent.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 75d7b3ae

io_uring/io_uring.c

+10 −6
Original line number Diff line number Diff line
@@ -1306,16 +1306,20 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, long min) 


	return ret;

}

inline void io_req_task_complete(struct io_kiocb *req, bool *locked)



void io_req_task_complete(struct io_kiocb *req, bool *locked)

{

	if (*locked) {

		req->cqe.flags |= io_put_kbuf(req, 0);

	if (req->flags & (REQ_F_BUFFER_SELECTED|REQ_F_BUFFER_RING)) {

		unsigned issue_flags = *locked ? 0 : IO_URING_F_UNLOCKED;



		req->cqe.flags |= io_put_kbuf(req, issue_flags);

	}



	if (*locked)

		io_req_add_compl_list(req);

	} else {

		req->cqe.flags |= io_put_kbuf(req, IO_URING_F_UNLOCKED);

	else

		io_req_complete_post(req);

}

}



/*

 * After the iocb has been issued, it's safe to be found on the poll list.