Commit ecddc25d authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: make timeout prep handlers consistent with other prep handlers 



All other opcodes take a {req, sqe} set for prep handling, split out
a timeout prep handler so that timeout and linked timeouts can use
the same one.

Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 140e40e3

fs/io_uring.c

+17 −4
Original line number Diff line number Diff line
@@ -7698,7 +7698,8 @@ static int io_timeout_remove(struct io_kiocb *req, unsigned int issue_flags) 
	return 0;

}



static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,

static int __io_timeout_prep(struct io_kiocb *req,

			     const struct io_uring_sqe *sqe,

			     bool is_timeout_link)

{

	struct io_timeout_data *data;
@@ -7754,6 +7755,18 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
	return 0;

}



static int io_timeout_prep(struct io_kiocb *req,

			   const struct io_uring_sqe *sqe)

{

	return __io_timeout_prep(req, sqe, false);

}



static int io_link_timeout_prep(struct io_kiocb *req,

				const struct io_uring_sqe *sqe)

{

	return __io_timeout_prep(req, sqe, true);

}



static int io_timeout(struct io_kiocb *req, unsigned int issue_flags)

{

	struct io_ring_ctx *ctx = req->ctx;
@@ -8039,13 +8052,13 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	case IORING_OP_CONNECT:

		return io_connect_prep(req, sqe);

	case IORING_OP_TIMEOUT:

		return io_timeout_prep(req, sqe, false);

		return io_timeout_prep(req, sqe);

	case IORING_OP_TIMEOUT_REMOVE:

		return io_timeout_remove_prep(req, sqe);

	case IORING_OP_ASYNC_CANCEL:

		return io_async_cancel_prep(req, sqe);

	case IORING_OP_LINK_TIMEOUT:

		return io_timeout_prep(req, sqe, true);

		return io_link_timeout_prep(req, sqe);

	case IORING_OP_ACCEPT:

		return io_accept_prep(req, sqe);

	case IORING_OP_FALLOCATE: