diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2010-06-07 03:27:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-09 16:14:25 -0700 |
| commit | 88e7594a9775e54dcd421cb246406dce62e48bee (patch) | |
| tree | 2a95adf9feb4c793d45d3ae86df05de4ca460d63 | |
| parent | bb69ae049fcc986fcd742eb90ca0d44a7a49c9f1 (diff) | |
| download | op-kernel-dev-88e7594a9775e54dcd421cb246406dce62e48bee.zip op-kernel-dev-88e7594a9775e54dcd421cb246406dce62e48bee.tar.gz | |
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>
| -rw-r--r-- | include/net/phonet/pn_dev.h | 1 | ||||
| -rw-r--r-- | net/phonet/pn_dev.c | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h index d7b989c..2d16783 100644 --- a/include/net/phonet/pn_dev.h +++ b/include/net/phonet/pn_dev.h @@ -34,6 +34,7 @@ struct phonet_device { struct list_head list; struct net_device *netdev; DECLARE_BITMAP(addrs, 64); + struct rcu_head rcu; }; int phonet_device_init(void); diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index c33da65..b18e48f 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c @@ -162,6 +162,14 @@ int phonet_address_add(struct net_device *dev, u8 addr) 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) { 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; mutex_unlock(&pndevs->lock); - if (pnd) { - synchronize_rcu(); - kfree(pnd); - } + if (pnd) + call_rcu(&pnd->rcu, phonet_device_rcu_free); + return err; } |
