From: Marek Lindner <lindner_marek@yahoo.de>
Date: Sun, 21 Nov 2010 23:55:44 +0000 (+0100)
Subject: Staging: batman-adv: use rcu callbacks when freeing batman_if
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3f427604d669031343af8e6ecd8d1cc7a6408ab2;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Staging: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c
index 6d5b74862f2..c2ff29432a5 100644
--- a/drivers/staging/batman-adv/hard-interface.c
+++ b/drivers/staging/batman-adv/hard-interface.c
@@ -36,6 +36,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;
@@ -462,9 +471,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/drivers/staging/batman-adv/hard-interface.h b/drivers/staging/batman-adv/hard-interface.h
index 1d1cd9ff712..30ec3b8db45 100644
--- a/drivers/staging/batman-adv/hard-interface.h
+++ b/drivers/staging/batman-adv/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/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
index d89ec70a67a..8f6ba1c5692 100644
--- a/drivers/staging/batman-adv/types.h
+++ b/drivers/staging/batman-adv/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;
 };
 
 /**