diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-11-23 07:09:32 +0000 |
|---|---|---|
| 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) | |
| download | lwn-2cfa5a0471fef43fda0b7bd87e3a5e4dbadb7809.tar.gz lwn-2cfa5a0471fef43fda0b7bd87e3a5e4dbadb7809.zip | |
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) if (vlan) { int index = get_slot(vlan, q); - rcu_assign_pointer(vlan->taps[index], NULL); - rcu_assign_pointer(q->vlan, NULL); + RCU_INIT_POINTER(vlan->taps[index], NULL); + RCU_INIT_POINTER(q->vlan, NULL); sock_put(&q->sk); --vlan->numvtaps; } @@ -223,8 +223,8 @@ static void macvtap_del_queues(struct net_device *dev) lockdep_is_held(&macvtap_lock)); if (q) { qlist[j++] = q; - rcu_assign_pointer(vlan->taps[i], NULL); - rcu_assign_pointer(q->vlan, NULL); + RCU_INIT_POINTER(vlan->taps[i], NULL); + RCU_INIT_POINTER(q->vlan, NULL); vlan->numvtaps--; } } |