diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-11-23 02:09:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-23 18:48:19 -0500 |
commit | 2cfa5a0471fef43fda0b7bd87e3a5e4dbadb7809 (patch) | |
tree | 0603cf740823a45337e2b82ba63bae96a6e75186 /drivers/net/macvtap.c | |
parent | 8c2152286aabe753519d7627a2992625b97e4b20 (diff) |
net: treewide use of RCU_INIT_POINTER
rcu_assign_pointer(ptr, NULL) can be safely replaced by
RCU_INIT_POINTER(ptr, NULL)
(old rcu_assign_pointer() macro was testing the NULL value and could
omit the smp_wmb(), but this had to be removed because of compiler
warnings)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvtap.c')
-rw-r--r-- | drivers/net/macvtap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 1b7082d08f33..7c88d136e723 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c | |||
@@ -145,8 +145,8 @@ static void macvtap_put_queue(struct macvtap_queue *q) | |||
145 | if (vlan) { | 145 | if (vlan) { |
146 | int index = get_slot(vlan, q); | 146 | int index = get_slot(vlan, q); |
147 | 147 | ||
148 | rcu_assign_pointer(vlan->taps[index], NULL); | 148 | RCU_INIT_POINTER(vlan->taps[index], NULL); |
149 | rcu_assign_pointer(q->vlan, NULL); | 149 | RCU_INIT_POINTER(q->vlan, NULL); |
150 | sock_put(&q->sk); | 150 | sock_put(&q->sk); |
151 | --vlan->numvtaps; | 151 | --vlan->numvtaps; |
152 | } | 152 | } |
@@ -223,8 +223,8 @@ static void macvtap_del_queues(struct net_device *dev) | |||
223 | lockdep_is_held(&macvtap_lock)); | 223 | lockdep_is_held(&macvtap_lock)); |
224 | if (q) { | 224 | if (q) { |
225 | qlist[j++] = q; | 225 | qlist[j++] = q; |
226 | rcu_assign_pointer(vlan->taps[i], NULL); | 226 | RCU_INIT_POINTER(vlan->taps[i], NULL); |
227 | rcu_assign_pointer(q->vlan, NULL); | 227 | RCU_INIT_POINTER(q->vlan, NULL); |
228 | vlan->numvtaps--; | 228 | vlan->numvtaps--; |
229 | } | 229 | } |
230 | } | 230 | } |