Browse Source

phonet: use call_rcu for phonet device free

Use call_rcu rather than synchronize_rcu.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jiri Pirko 15 years ago
parent
commit
88e7594a97
2 changed files with 12 additions and 4 deletions
  1. 1 0
      include/net/phonet/pn_dev.h
  2. 11 4
      net/phonet/pn_dev.c

+ 1 - 0
include/net/phonet/pn_dev.h

@@ -34,6 +34,7 @@ struct phonet_device {
 	struct list_head list;
 	struct list_head list;
 	struct net_device *netdev;
 	struct net_device *netdev;
 	DECLARE_BITMAP(addrs, 64);
 	DECLARE_BITMAP(addrs, 64);
+	struct rcu_head	rcu;
 };
 };
 
 
 int phonet_device_init(void);
 int phonet_device_init(void);

+ 11 - 4
net/phonet/pn_dev.c

@@ -162,6 +162,14 @@ int phonet_address_add(struct net_device *dev, u8 addr)
 	return err;
 	return err;
 }
 }
 
 
+static void phonet_device_rcu_free(struct rcu_head *head)
+{
+	struct phonet_device *pnd;
+
+	pnd = container_of(head, struct phonet_device, rcu);
+	kfree(pnd);
+}
+
 int phonet_address_del(struct net_device *dev, u8 addr)
 int phonet_address_del(struct net_device *dev, u8 addr)
 {
 {
 	struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
 	struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
@@ -179,10 +187,9 @@ int phonet_address_del(struct net_device *dev, u8 addr)
 		pnd = NULL;
 		pnd = NULL;
 	mutex_unlock(&pndevs->lock);
 	mutex_unlock(&pndevs->lock);
 
 
-	if (pnd) {
-		synchronize_rcu();
-		kfree(pnd);
-	}
+	if (pnd)
+		call_rcu(&pnd->rcu, phonet_device_rcu_free);
+
 	return err;
 	return err;
 }
 }