diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-06-06 23:27:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-09 19:14:25 -0400 |
commit | 88e7594a9775e54dcd421cb246406dce62e48bee (patch) | |
tree | 2a95adf9feb4c793d45d3ae86df05de4ca460d63 /net/phonet/pn_dev.c | |
parent | bb69ae049fcc986fcd742eb90ca0d44a7a49c9f1 (diff) |
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>
Diffstat (limited to 'net/phonet/pn_dev.c')
-rw-r--r-- | net/phonet/pn_dev.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index c33da6576942..b18e48fae975 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) | |||
162 | return err; | 162 | return err; |
163 | } | 163 | } |
164 | 164 | ||
165 | static void phonet_device_rcu_free(struct rcu_head *head) | ||
166 | { | ||
167 | struct phonet_device *pnd; | ||
168 | |||
169 | pnd = container_of(head, struct phonet_device, rcu); | ||
170 | kfree(pnd); | ||
171 | } | ||
172 | |||
165 | int phonet_address_del(struct net_device *dev, u8 addr) | 173 | int phonet_address_del(struct net_device *dev, u8 addr) |
166 | { | 174 | { |
167 | struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev)); | 175 | 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) | |||
179 | pnd = NULL; | 187 | pnd = NULL; |
180 | mutex_unlock(&pndevs->lock); | 188 | mutex_unlock(&pndevs->lock); |
181 | 189 | ||
182 | if (pnd) { | 190 | if (pnd) |
183 | synchronize_rcu(); | 191 | call_rcu(&pnd->rcu, phonet_device_rcu_free); |
184 | kfree(pnd); | 192 | |
185 | } | ||
186 | return err; | 193 | return err; |
187 | } | 194 | } |
188 | 195 | ||