Commit 356c81b6 authored by Julia Lawall's avatar Julia Lawall Committed by Simon Wunderlich
Browse files

batman-adv: 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>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 5c956d11

net/batman-adv/translation-table.c

+3 −44
Original line number Diff line number Diff line
@@ -209,20 +209,6 @@ batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr, 
	return tt_global_entry;

}



/**

 * batadv_tt_local_entry_free_rcu() - free the tt_local_entry

 * @rcu: rcu pointer of the tt_local_entry

 */

static void batadv_tt_local_entry_free_rcu(struct rcu_head *rcu)

{

	struct batadv_tt_local_entry *tt_local_entry;



	tt_local_entry = container_of(rcu, struct batadv_tt_local_entry,

				      common.rcu);



	kmem_cache_free(batadv_tl_cache, tt_local_entry);

}



/**

 * batadv_tt_local_entry_release() - release tt_local_entry from lists and queue

 *  for free after rcu grace period
@@ -237,7 +223,7 @@ static void batadv_tt_local_entry_release(struct kref *ref) 


	batadv_softif_vlan_put(tt_local_entry->vlan);



	call_rcu(&tt_local_entry->common.rcu, batadv_tt_local_entry_free_rcu);

	kfree_rcu(tt_local_entry, common.rcu);

}



/**
@@ -255,20 +241,6 @@ batadv_tt_local_entry_put(struct batadv_tt_local_entry *tt_local_entry) 
		 batadv_tt_local_entry_release);

}



/**

 * batadv_tt_global_entry_free_rcu() - free the tt_global_entry

 * @rcu: rcu pointer of the tt_global_entry

 */

static void batadv_tt_global_entry_free_rcu(struct rcu_head *rcu)

{

	struct batadv_tt_global_entry *tt_global_entry;



	tt_global_entry = container_of(rcu, struct batadv_tt_global_entry,

				       common.rcu);



	kmem_cache_free(batadv_tg_cache, tt_global_entry);

}



/**

 * batadv_tt_global_entry_release() - release tt_global_entry from lists and

 *  queue for free after rcu grace period
@@ -283,7 +255,7 @@ void batadv_tt_global_entry_release(struct kref *ref) 


	batadv_tt_global_del_orig_list(tt_global_entry);



	call_rcu(&tt_global_entry->common.rcu, batadv_tt_global_entry_free_rcu);

	kfree_rcu(tt_global_entry, common.rcu);

}



/**
@@ -408,19 +380,6 @@ static void batadv_tt_global_size_dec(struct batadv_orig_node *orig_node, 
	batadv_tt_global_size_mod(orig_node, vid, -1);

}



/**

 * batadv_tt_orig_list_entry_free_rcu() - free the orig_entry

 * @rcu: rcu pointer of the orig_entry

 */

static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu)

{

	struct batadv_tt_orig_list_entry *orig_entry;



	orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu);



	kmem_cache_free(batadv_tt_orig_cache, orig_entry);

}



/**

 * batadv_tt_orig_list_entry_release() - release tt orig entry from lists and

 *  queue for free after rcu grace period
@@ -434,7 +393,7 @@ static void batadv_tt_orig_list_entry_release(struct kref *ref) 
				  refcount);



	batadv_orig_node_put(orig_entry->orig_node);

	call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu);

	kfree_rcu(orig_entry, rcu);

}



/**