Commit 28878733 authored by Julia Lawall's avatar Julia Lawall Committed by Jens Axboe
Browse files

block: replace call_rcu by kfree_rcu for simple kmem_cache_free callback 



Since SLOB was removed and since
commit 6c6c47b0 ("mm, slab: call kvfree_rcu_barrier() from kmem_cache_destroy()"),
it is not necessary to use call_rcu when the callback only performs
kmem_cache_free. Use kfree_rcu() directly.

The changes were made using Coccinelle.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@inria.fr>
Link: https://lore.kernel.org/r/20241013201704.49576-10-Julia.Lawall@inria.fr


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

block/blk-ioc.c

+1 −8
Original line number Diff line number Diff line
@@ -32,13 +32,6 @@ static void get_io_context(struct io_context *ioc) 
	atomic_long_inc(&ioc->refcount);

}



static void icq_free_icq_rcu(struct rcu_head *head)

{

	struct io_cq *icq = container_of(head, struct io_cq, __rcu_head);



	kmem_cache_free(icq->__rcu_icq_cache, icq);

}



/*

 * Exit an icq. Called with ioc locked for blk-mq, and with both ioc

 * and queue locked for legacy.
@@ -102,7 +95,7 @@ static void ioc_destroy_icq(struct io_cq *icq) 
	 */

	icq->__rcu_icq_cache = et->icq_cache;

	icq->flags |= ICQ_DESTROYED;

	call_rcu(&icq->__rcu_head, icq_free_icq_rcu);

	kfree_rcu(icq, __rcu_head);

}



/*