The following commit has been merged in the next branch: commit b25cb3ddcccd1564ee90bd42b649b1a167640797 Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Oct 9 11:44:44 2010 +0000
batman-adv: use rcu callbacks when freeing batman_if
Signed-off-by: Marek Lindner lindner_marek@yahoo.de Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de
diff --git a/hard-interface.c b/hard-interface.c index 70d69bd..3346415 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -38,6 +38,15 @@ /* protect update critical side of if_list - but not the content */ static DEFINE_SPINLOCK(if_list_lock);
+static void hardif_free_rcu(struct rcu_head *rcu) +{ + struct batman_if *batman_if; + + batman_if = container_of(rcu, struct batman_if, rcu); + dev_put(batman_if->net_dev); + kref_put(&batman_if->refcount, hardif_free_ref); +} + struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev) { struct batman_if *batman_if; @@ -464,9 +473,8 @@ static void hardif_remove_interface(struct batman_if *batman_if) return;
batman_if->if_status = IF_TO_BE_REMOVED; - synchronize_rcu(); sysfs_del_hardif(&batman_if->hardif_obj); - kref_put(&batman_if->refcount, hardif_free_ref); + call_rcu(&batman_if->rcu, hardif_free_rcu); }
void hardif_remove_interfaces(void) diff --git a/hard-interface.h b/hard-interface.h index 1d1cd9f..30ec3b8 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -47,7 +47,6 @@ static inline void hardif_free_ref(struct kref *refcount) struct batman_if *batman_if;
batman_if = container_of(refcount, struct batman_if, refcount); - dev_put(batman_if->net_dev); kfree(batman_if); }
diff --git a/types.h b/types.h index d89ec70..8f6ba1c 100644 --- a/types.h +++ b/types.h @@ -46,6 +46,7 @@ struct batman_if { struct kref refcount; struct packet_type batman_adv_ptype; struct net_device *soft_iface; + struct rcu_head rcu; };
/**