Commit 8abf47a8 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/cancel: get rid of init_hash_table() helper 



All it does is initialize the lists, just move the INIT_HLIST_HEAD()
into the one caller.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ba4366f5

io_uring/cancel.c

+0 −8
Original line number Diff line number Diff line
@@ -232,14 +232,6 @@ int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags) 
	return IOU_OK;

}



void init_hash_table(struct io_hash_table *table, unsigned size)

{

	unsigned int i;



	for (i = 0; i < size; i++)

		INIT_HLIST_HEAD(&table->hbs[i].list);

}



static int __io_sync_cancel(struct io_uring_task *tctx,

			    struct io_cancel_data *cd, int fd)

{

io_uring/cancel.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags); 


int io_try_cancel(struct io_uring_task *tctx, struct io_cancel_data *cd,

		  unsigned int issue_flags);

void init_hash_table(struct io_hash_table *table, unsigned size);



int io_sync_cancel(struct io_ring_ctx *ctx, void __user *arg);

bool io_cancel_req_match(struct io_kiocb *req, struct io_cancel_data *cd);

io_uring/io_uring.c

+3 −1
Original line number Diff line number Diff line
@@ -263,13 +263,15 @@ static int io_alloc_hash_table(struct io_hash_table *table, unsigned bits) 
{

	unsigned hash_buckets = 1U << bits;

	size_t hash_size = hash_buckets * sizeof(table->hbs[0]);

	int i;



	table->hbs = kmalloc(hash_size, GFP_KERNEL);

	if (!table->hbs)

		return -ENOMEM;



	table->hash_bits = bits;

	init_hash_table(table, hash_buckets);

	for (i = 0; i < hash_buckets; i++)

		INIT_HLIST_HEAD(&table->hbs[i].list);

	return 0;

}