From: Caleb Sander Mateos <csander@purestorage.com>
Date: Wed, 26 Nov 2025 00:59:34 +0000 (-0700)
Subject: io_uring/query: drop unused io_handle_query_entry() ctx arg
X-Git-Tag: v6.19-rc1~169^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e93de9205b4d5c0f06507e9e1c398574a07fb80;p=thirdparty%2Fkernel%2Flinux.git

io_uring/query: drop unused io_handle_query_entry() ctx arg

io_handle_query_entry() doesn't use its struct io_ring_ctx *ctx
argument. So remove it from the function and its callers.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/io_uring/query.c b/io_uring/query.c
index e61b6221f87f2..abdd6f3e1223d 100644
--- a/io_uring/query.c
+++ b/io_uring/query.c
@@ -53,8 +53,7 @@ static ssize_t io_query_scq(union io_query_data *data)
 	return sizeof(*e);
 }
 
-static int io_handle_query_entry(struct io_ring_ctx *ctx,
-				 union io_query_data *data, void __user *uhdr,
+static int io_handle_query_entry(union io_query_data *data, void __user *uhdr,
 				 u64 *next_entry)
 {
 	struct io_uring_query_hdr hdr;
@@ -107,7 +106,7 @@ out:
 	return 0;
 }
 
-int io_query(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_args)
+int io_query(void __user *arg, unsigned nr_args)
 {
 	union io_query_data entry_buffer;
 	void __user *uhdr = arg;
@@ -121,7 +120,7 @@ int io_query(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_args)
 	while (uhdr) {
 		u64 next_hdr;
 
-		ret = io_handle_query_entry(ctx, &entry_buffer, uhdr, &next_hdr);
+		ret = io_handle_query_entry(&entry_buffer, uhdr, &next_hdr);
 		if (ret)
 			return ret;
 		uhdr = u64_to_user_ptr(next_hdr);
diff --git a/io_uring/query.h b/io_uring/query.h
index 171d47ccaabaf..b35eb52f0ea84 100644
--- a/io_uring/query.h
+++ b/io_uring/query.h
@@ -4,6 +4,6 @@
 
 #include <linux/io_uring_types.h>
 
-int io_query(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_args);
+int io_query(void __user *arg, unsigned nr_args);
 
 #endif
diff --git a/io_uring/register.c b/io_uring/register.c
index db42f98562c4e..62d39b3ff317e 100644
--- a/io_uring/register.c
+++ b/io_uring/register.c
@@ -813,7 +813,7 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,
 		ret = io_register_mem_region(ctx, arg);
 		break;
 	case IORING_REGISTER_QUERY:
-		ret = io_query(ctx, arg, nr_args);
+		ret = io_query(arg, nr_args);
 		break;
 	case IORING_REGISTER_ZCRX_CTRL:
 		ret = io_zcrx_ctrl(ctx, arg, nr_args);
@@ -888,7 +888,7 @@ static int io_uring_register_blind(unsigned int opcode, void __user *arg,
 	case IORING_REGISTER_SEND_MSG_RING:
 		return io_uring_register_send_msg_ring(arg, nr_args);
 	case IORING_REGISTER_QUERY:
-		return io_query(NULL, arg, nr_args);
+		return io_query(arg, nr_args);
 	}
 	return -EINVAL;
 }