aboutsummaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-08-01 12:19:00 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-02 07:29:23 -0400
commita9b3cd7f323b2e57593e7215362a7b02fc933e3a (patch)
treeeba1741956aef3015d5b1a07253bf93c4c1bc7df /net/socket.c
parent76f793e3a47139d340185cbc1a314740c09b13d3 (diff)
rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER
When assigning a NULL value to an RCU protected pointer, no barrier is needed. The rcu_assign_pointer, used to handle that but will soon change to not handle the special case. Convert all rcu_assign_pointer of NULL value. //smpl @@ expression P; @@ - rcu_assign_pointer(P, NULL) + RCU_INIT_POINTER(P, NULL) // </smpl> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c
index b1cbbcd92558..7ec8f9b669b3 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2463,7 +2463,7 @@ int sock_register(const struct net_proto_family *ops)
2463 lockdep_is_held(&net_family_lock))) 2463 lockdep_is_held(&net_family_lock)))
2464 err = -EEXIST; 2464 err = -EEXIST;
2465 else { 2465 else {
2466 rcu_assign_pointer(net_families[ops->family], ops); 2466 RCU_INIT_POINTER(net_families[ops->family], ops);
2467 err = 0; 2467 err = 0;
2468 } 2468 }
2469 spin_unlock(&net_family_lock); 2469 spin_unlock(&net_family_lock);
@@ -2491,7 +2491,7 @@ void sock_unregister(int family)
2491 BUG_ON(family < 0 || family >= NPROTO); 2491 BUG_ON(family < 0 || family >= NPROTO);
2492 2492
2493 spin_lock(&net_family_lock); 2493 spin_lock(&net_family_lock);
2494 rcu_assign_pointer(net_families[family], NULL); 2494 RCU_INIT_POINTER(net_families[family], NULL);
2495 spin_unlock(&net_family_lock); 2495 spin_unlock(&net_family_lock);
2496 2496
2497 synchronize_rcu(); 2497 synchronize_rcu();