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 e61b6221f87f27445239430a33e57cd6904b5d15..abdd6f3e1223dab7d38e9880d7491d29e7dd0ad9 100644 (file)
--- 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 @@ static int io_handle_query_entry(struct io_ring_ctx *ctx,
        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 171d47ccaabaf77261f5a6f0edc469a49b5f8413..b35eb52f0ea841052fa475dc432795d04afc1f95 100644 (file)
--- 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 db42f98562c4e05d6ed16f7f216a103d8a09c5b0..62d39b3ff317e7b0540152b5c6f019bfab0d66fd 100644 (file)
--- 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;
 }