commit a9b3cd7f323b2e57593e7215362a7b02fc933e3a
author Stephen Hemminger <shemminger@vyatta.com> Mon Aug 01 16:19:00 2011 +0000
committer David S. Miller <davem@davemloft.net> Tue Aug 02 04:29:23 2011 -0700
tree eba1741956aef3015d5b1a07253bf93c4c1bc7df
parent 76f793e3a47139d340185cbc1a314740c09b13d3

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>

net/socket.c

diff --git a/net/socket.c b/net/socket.c
index b1cbbcd..7ec8f9b6 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2463,7 +2463,7 @@
 				      lockdep_is_held(&net_family_lock)))
 		err = -EEXIST;
 	else {
-		rcu_assign_pointer(net_families[ops->family], ops);
+		RCU_INIT_POINTER(net_families[ops->family], ops);
 		err = 0;
 	}
 	spin_unlock(&net_family_lock);
@@ -2491,7 +2491,7 @@
 	BUG_ON(family < 0 || family >= NPROTO);
 
 	spin_lock(&net_family_lock);
-	rcu_assign_pointer(net_families[family], NULL);
+	RCU_INIT_POINTER(net_families[family], NULL);
 	spin_unlock(&net_family_lock);
 
 	synchronize_rcu();