Skip to content

Commit 2887873

Browse files
JuliaLawallaxboe
authored andcommitted
block: replace call_rcu by kfree_rcu for simple kmem_cache_free callback
Since SLOB was removed and since commit 6c6c47b ("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: Julia Lawall <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent b21d948 commit 2887873

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

block/blk-ioc.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ static void get_io_context(struct io_context *ioc)
3232
atomic_long_inc(&ioc->refcount);
3333
}
3434

35-
static void icq_free_icq_rcu(struct rcu_head *head)
36-
{
37-
struct io_cq *icq = container_of(head, struct io_cq, __rcu_head);
38-
39-
kmem_cache_free(icq->__rcu_icq_cache, icq);
40-
}
41-
4235
/*
4336
* Exit an icq. Called with ioc locked for blk-mq, and with both ioc
4437
* and queue locked for legacy.
@@ -102,7 +95,7 @@ static void ioc_destroy_icq(struct io_cq *icq)
10295
*/
10396
icq->__rcu_icq_cache = et->icq_cache;
10497
icq->flags |= ICQ_DESTROYED;
105-
call_rcu(&icq->__rcu_head, icq_free_icq_rcu);
98+
kfree_rcu(icq, __rcu_head);
10699
}
107100

108101
/*

0 commit comments

Comments
 (0)