From ecddc25d1355d0ce2b486a4991b826b6e87875a9 Mon Sep 17 00:00:00 2001

From: Jens Axboe <axboe@kernel.dk>

Date: Mon, 23 May 2022 16:13:56 -0600

Subject: [PATCH] io_uring: make timeout prep handlers consistent with other

 prep handlers

Git-commit: ecddc25d1355d0ce2b486a4991b826b6e87875a9

Patch-mainline: v5.19-rc1

References: bsc#1205205

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: Kanchan Joshi <joshi.k@samsung.com>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>

---

 fs/io_uring.c | 21 +++++++++++++++++----

 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c

index 9f1c682d7caf..c3991034b26a 100644

--- a/fs/io_uring.c

+++ b/fs/io_uring.c

@@ -7698,8 +7698,9 @@ 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,

-			   bool is_timeout_link)

+static int __io_timeout_prep(struct io_kiocb *req,

+			     const struct io_uring_sqe *sqe,

+			     bool is_timeout_link)

 {

 	struct io_timeout_data *data;

 	unsigned flags;

@@ -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:

-- 

2.35.3