@@ -577,13 +577,6 @@ static inline void cgw_unregister_filter(struct net *net, struct cgw_job *gwj)
gwj->ccgw.filter.can_mask, can_can_gw_rcv, gwj);
}
-static void cgw_job_free_rcu(struct rcu_head *rcu_head)
-{
- struct cgw_job *gwj = container_of(rcu_head, struct cgw_job, rcu);
-
- kmem_cache_free(cgw_cache, gwj);
-}
-
static int cgw_notifier(struct notifier_block *nb,
unsigned long msg, void *ptr)
{
@@ -603,7 +596,7 @@ static int cgw_notifier(struct notifier_block *nb,
if (gwj->src.dev == dev || gwj->dst.dev == dev) {
hlist_del(&gwj->list);
cgw_unregister_filter(net, gwj);
- call_rcu(&gwj->rcu, cgw_job_free_rcu);
+ kfree_rcu(gwj, rcu);
}
}
}
@@ -1168,7 +1161,7 @@ static void cgw_remove_all_jobs(struct net *net)
hlist_for_each_entry_safe(gwj, nx, &net->can.cgw_list, list) {
hlist_del(&gwj->list);
cgw_unregister_filter(net, gwj);
- call_rcu(&gwj->rcu, cgw_job_free_rcu);
+ kfree_rcu(gwj, rcu);
}
}
@@ -1236,7 +1229,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh,
hlist_del(&gwj->list);
cgw_unregister_filter(net, gwj);
- call_rcu(&gwj->rcu, cgw_job_free_rcu);
+ kfree_rcu(gwj, rcu);
err = 0;
break;
}
Since SLOB was removed and since commit 6c6c47b063b5 ("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> --- net/can/gw.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)