Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Caleb Sander Mateos
and committed by
Jens Axboe
1e93de92
84692a15
+6
-7
+3
-4
io_uring/query.c
+3
-4
io_uring/query.c
···
53
53
return sizeof(*e);
54
54
}
55
55
56
-
static int io_handle_query_entry(struct io_ring_ctx *ctx,
57
-
union io_query_data *data, void __user *uhdr,
56
+
static int io_handle_query_entry(union io_query_data *data, void __user *uhdr,
58
57
u64 *next_entry)
59
58
{
60
59
struct io_uring_query_hdr hdr;
···
106
107
return 0;
107
108
}
108
109
109
-
int io_query(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_args)
110
+
int io_query(void __user *arg, unsigned nr_args)
110
111
{
111
112
union io_query_data entry_buffer;
112
113
void __user *uhdr = arg;
···
120
121
while (uhdr) {
121
122
u64 next_hdr;
122
123
123
-
ret = io_handle_query_entry(ctx, &entry_buffer, uhdr, &next_hdr);
124
+
ret = io_handle_query_entry(&entry_buffer, uhdr, &next_hdr);
124
125
if (ret)
125
126
return ret;
126
127
uhdr = u64_to_user_ptr(next_hdr);
+1
-1
io_uring/query.h
+1
-1
io_uring/query.h
+2
-2
io_uring/register.c
+2
-2
io_uring/register.c
···
813
813
ret = io_register_mem_region(ctx, arg);
814
814
break;
815
815
case IORING_REGISTER_QUERY:
816
-
ret = io_query(ctx, arg, nr_args);
816
+
ret = io_query(arg, nr_args);
817
817
break;
818
818
case IORING_REGISTER_ZCRX_CTRL:
819
819
ret = io_zcrx_ctrl(ctx, arg, nr_args);
···
888
888
case IORING_REGISTER_SEND_MSG_RING:
889
889
return io_uring_register_send_msg_ring(arg, nr_args);
890
890
case IORING_REGISTER_QUERY:
891
-
return io_query(NULL, arg, nr_args);
891
+
return io_query(arg, nr_args);
892
892
}
893
893
return -EINVAL;
894
894
}