Skip to content

Commit

Permalink
block: replace call_rcu by kfree_rcu for simple kmem_cache_free callback
Browse files Browse the repository at this point in the history
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 <Julia.Lawall@inria.fr>
Link: https://lore.kernel.org/r/20241013201704.49576-10-Julia.Lawall@inria.fr
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
JuliaLawall authored and axboe committed Oct 13, 2024
1 parent 010194b commit 7a9b197
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions block/blk-ioc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit 7a9b197

Please sign in to comment.