io_uring/query: drop unused io_handle_query_entry() ctx arg
PATCH 1/1 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 <[email protected]>
--- io_uring/query.c | 7 +++---- io_uring/query.h | 2 +- io_uring/register.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-)
io_uring/query.c +3 -4
@@ -51,12 +51,11 @@ static ssize_t io_query_scq(union io_query_data *data) e->hdr_size =sizeof (struct io_rings ); e->hdr_alignment =SMP_CACHE_BYTES ;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;size_t usize, res_size =0 ;ssize_t ret = -EINVAL ;
@@ -105,11 +104,11 @@ static int io_handle_query_entry(struct io_ring_ctx *ctx,return -EFAULT ; *next_entry = hdr.next_entry;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;int ret, nr =0 ;
@@ -119,11 +118,11 @@ int io_query(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_args)return -EINVAL ;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);/* Have some limit to avoid a potential cycle */
io_uring/query.h +1 -1
@@ -2,8 +2,8 @@#ifndef IORING_QUERY_H #define IORING_QUERY_H #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
io_uring/register.c +2 -2
@@ -811,11 +811,11 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,if (!arg || nr_args !=1 )break ; 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);break ;default :
@@ -886,11 +886,11 @@ static int io_uring_register_blind(unsigned int opcode, void __user *arg, {switch (opcode) {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 ; } SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode,
Signature · 1 line
2.45.2
Quoted 4 lines · Caleb Sander Mateos
io_handle_query_entry()doesn't use its structio_ring_ctx*ctx argument. So remove it from the function and its callers.
Applied, thanks!
[1/1] io_uring/query: drop unused io_handle_query_entry() ctx arg
commit: 1e93de9205b4d5c0f06507e9e1c398574a07fb80
Best regards,
Signature · 1 line
Jens Axboe