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>

9 files changed, 31 insertions, 31 deletions

diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 899b71c0ff5d..3346829ea07f 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -37,7 +37,7 @@ int nf_register_afinfo(const struct nf_afinfo *afinfo)
         err = mutex_lock_interruptible(&afinfo_mutex);
         if (err < 0)
                 return err;
-        rcu_assign_pointer(nf_afinfo[afinfo->family], afinfo);
+        RCU_INIT_POINTER(nf_afinfo[afinfo->family], afinfo);
         mutex_unlock(&afinfo_mutex);
         return 0;
 }
@@ -46,7 +46,7 @@ EXPORT_SYMBOL_GPL(nf_register_afinfo);
 void nf_unregister_afinfo(const struct nf_afinfo *afinfo)
 {
         mutex_lock(&afinfo_mutex);
-        rcu_assign_pointer(nf_afinfo[afinfo->family], NULL);
+        RCU_INIT_POINTER(nf_afinfo[afinfo->family], NULL);
         mutex_unlock(&afinfo_mutex);
         synchronize_rcu();
 }
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index f7af8b866017..5acfaf59a9c3 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -779,7 +779,7 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
                 if (exp->helper) {
                         help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
                         if (help)
-                                rcu_assign_pointer(help->helper, exp->helper);
+                                RCU_INIT_POINTER(help->helper, exp->helper);
                 }
 
 #ifdef CONFIG_NF_CONNTRACK_MARK
@@ -1317,7 +1317,7 @@ static void nf_conntrack_cleanup_net(struct net *net)
 void nf_conntrack_cleanup(struct net *net)
 {
         if (net_eq(net, &init_net))
-                rcu_assign_pointer(ip_ct_attach, NULL);
+                RCU_INIT_POINTER(ip_ct_attach, NULL);
 
         /* This makes sure all current packets have passed through
            netfilter framework.  Roll on, two-stage module
@@ -1327,7 +1327,7 @@ void nf_conntrack_cleanup(struct net *net)
         nf_conntrack_cleanup_net(net);
 
         if (net_eq(net, &init_net)) {
-                rcu_assign_pointer(nf_ct_destroy, NULL);
+                RCU_INIT_POINTER(nf_ct_destroy, NULL);
                 nf_conntrack_cleanup_init_net();
         }
 }
@@ -1576,11 +1576,11 @@ int nf_conntrack_init(struct net *net)
 
         if (net_eq(net, &init_net)) {
                 /* For use by REJECT target */
-                rcu_assign_pointer(ip_ct_attach, nf_conntrack_attach);
-                rcu_assign_pointer(nf_ct_destroy, destroy_conntrack);
+                RCU_INIT_POINTER(ip_ct_attach, nf_conntrack_attach);
+                RCU_INIT_POINTER(nf_ct_destroy, destroy_conntrack);
 
                 /* Howto get NAT offsets */
-                rcu_assign_pointer(nf_ct_nat_offset, NULL);
+                RCU_INIT_POINTER(nf_ct_nat_offset, NULL);
         }
         return 0;
 
diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
index 63a1b915a7e4..3add99439059 100644
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -94,7 +94,7 @@ int nf_conntrack_register_notifier(struct nf_ct_event_notifier *new)
                 ret = -EBUSY;
                 goto out_unlock;
         }
-        rcu_assign_pointer(nf_conntrack_event_cb, new);
+        RCU_INIT_POINTER(nf_conntrack_event_cb, new);
         mutex_unlock(&nf_ct_ecache_mutex);
         return ret;
 
@@ -112,7 +112,7 @@ void nf_conntrack_unregister_notifier(struct nf_ct_event_notifier *new)
         notify = rcu_dereference_protected(nf_conntrack_event_cb,
                                            lockdep_is_held(&nf_ct_ecache_mutex));
         BUG_ON(notify != new);
-        rcu_assign_pointer(nf_conntrack_event_cb, NULL);
+        RCU_INIT_POINTER(nf_conntrack_event_cb, NULL);
         mutex_unlock(&nf_ct_ecache_mutex);
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier);
@@ -129,7 +129,7 @@ int nf_ct_expect_register_notifier(struct nf_exp_event_notifier *new)
                 ret = -EBUSY;
                 goto out_unlock;
         }
-        rcu_assign_pointer(nf_expect_event_cb, new);
+        RCU_INIT_POINTER(nf_expect_event_cb, new);
         mutex_unlock(&nf_ct_ecache_mutex);
         return ret;
 
@@ -147,7 +147,7 @@ void nf_ct_expect_unregister_notifier(struct nf_exp_event_notifier *new)
         notify = rcu_dereference_protected(nf_expect_event_cb,
                                            lockdep_is_held(&nf_ct_ecache_mutex));
         BUG_ON(notify != new);
-        rcu_assign_pointer(nf_expect_event_cb, NULL);
+        RCU_INIT_POINTER(nf_expect_event_cb, NULL);
         mutex_unlock(&nf_ct_ecache_mutex);
 }
 EXPORT_SYMBOL_GPL(nf_ct_expect_unregister_notifier);
diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c
index 05ecdc281a53..4605c947dcc4 100644
--- a/net/netfilter/nf_conntrack_extend.c
+++ b/net/netfilter/nf_conntrack_extend.c
@@ -169,7 +169,7 @@ int nf_ct_extend_register(struct nf_ct_ext_type *type)
            before updating alloc_size */
         type->alloc_size = ALIGN(sizeof(struct nf_ct_ext), type->align)
                            + type->len;
-        rcu_assign_pointer(nf_ct_ext_types[type->id], type);
+        RCU_INIT_POINTER(nf_ct_ext_types[type->id], type);
         update_alloc_size(type);
 out:
         mutex_unlock(&nf_ct_ext_type_mutex);
@@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(nf_ct_extend_register);
 void nf_ct_extend_unregister(struct nf_ct_ext_type *type)
 {
         mutex_lock(&nf_ct_ext_type_mutex);
-        rcu_assign_pointer(nf_ct_ext_types[type->id], NULL);
+        RCU_INIT_POINTER(nf_ct_ext_types[type->id], NULL);
         update_alloc_size(type);
         mutex_unlock(&nf_ct_ext_type_mutex);
         rcu_barrier(); /* Wait for completion of call_rcu()'s */
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index 1bdfea357955..93c4bdbfc1ae 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -131,7 +131,7 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
                 helper = __nf_ct_helper_find(&ct->tuplehash[IP_CT_DIR_REPLY].tuple);
         if (helper == NULL) {
                 if (help)
-                        rcu_assign_pointer(help->helper, NULL);
+                        RCU_INIT_POINTER(help->helper, NULL);
                 goto out;
         }
 
@@ -145,7 +145,7 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
                 memset(&help->help, 0, sizeof(help->help));
         }
 
-        rcu_assign_pointer(help->helper, helper);
+        RCU_INIT_POINTER(help->helper, helper);
 out:
         return ret;
 }
@@ -162,7 +162,7 @@ static inline int unhelp(struct nf_conntrack_tuple_hash *i,
                         lockdep_is_held(&nf_conntrack_lock)
                         ) == me) {
                 nf_conntrack_event(IPCT_HELPER, ct);
-                rcu_assign_pointer(help->helper, NULL);
+                RCU_INIT_POINTER(help->helper, NULL);
         }
         return 0;
 }
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 7dec88a1755b..e58aa9b1fe8a 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1125,7 +1125,7 @@ ctnetlink_change_helper(struct nf_conn *ct, const struct nlattr * const cda[])
                 if (help && help->helper) {
                         /* we had a helper before ... */
                         nf_ct_remove_expectations(ct);
-                        rcu_assign_pointer(help->helper, NULL);
+                        RCU_INIT_POINTER(help->helper, NULL);
                 }
 
                 return 0;
@@ -1163,7 +1163,7 @@ ctnetlink_change_helper(struct nf_conn *ct, const struct nlattr * const cda[])
                 return -EOPNOTSUPP;
         }
 
-        rcu_assign_pointer(help->helper, helper);
+        RCU_INIT_POINTER(help->helper, helper);
 
         return 0;
 }
@@ -1386,7 +1386,7 @@ ctnetlink_create_conntrack(struct net *net, u16 zone,
                         }
 
                         /* not in hash table yet so not strictly necessary */
-                        rcu_assign_pointer(help->helper, helper);
+                        RCU_INIT_POINTER(help->helper, helper);
                 }
         } else {
                 /* try an implicit helper assignation */
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 20714edf6cd2..ce0c406f58a8 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -55,7 +55,7 @@ int nf_log_register(u_int8_t pf, struct nf_logger *logger)
                 llog = rcu_dereference_protected(nf_loggers[pf],
                                                  lockdep_is_held(&nf_log_mutex));
                 if (llog == NULL)
-                        rcu_assign_pointer(nf_loggers[pf], logger);
+                        RCU_INIT_POINTER(nf_loggers[pf], logger);
         }
 
         mutex_unlock(&nf_log_mutex);
@@ -74,7 +74,7 @@ void nf_log_unregister(struct nf_logger *logger)
                 c_logger = rcu_dereference_protected(nf_loggers[i],
                                                      lockdep_is_held(&nf_log_mutex));
                 if (c_logger == logger)
-                        rcu_assign_pointer(nf_loggers[i], NULL);
+                        RCU_INIT_POINTER(nf_loggers[i], NULL);
                 list_del(&logger->list[i]);
         }
         mutex_unlock(&nf_log_mutex);
@@ -92,7 +92,7 @@ int nf_log_bind_pf(u_int8_t pf, const struct nf_logger *logger)
                 mutex_unlock(&nf_log_mutex);
                 return -ENOENT;
         }
-        rcu_assign_pointer(nf_loggers[pf], logger);
+        RCU_INIT_POINTER(nf_loggers[pf], logger);
         mutex_unlock(&nf_log_mutex);
         return 0;
 }
@@ -103,7 +103,7 @@ void nf_log_unbind_pf(u_int8_t pf)
         if (pf >= ARRAY_SIZE(nf_loggers))
                 return;
         mutex_lock(&nf_log_mutex);
-        rcu_assign_pointer(nf_loggers[pf], NULL);
+        RCU_INIT_POINTER(nf_loggers[pf], NULL);
         mutex_unlock(&nf_log_mutex);
 }
 EXPORT_SYMBOL(nf_log_unbind_pf);
@@ -250,7 +250,7 @@ static int nf_log_proc_dostring(ctl_table *table, int write,
                         mutex_unlock(&nf_log_mutex);
                         return -ENOENT;
                 }
-                rcu_assign_pointer(nf_loggers[tindex], logger);
+                RCU_INIT_POINTER(nf_loggers[tindex], logger);
                 mutex_unlock(&nf_log_mutex);
         } else {
                 mutex_lock(&nf_log_mutex);
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 5b466cd1272f..c1894ae196de 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -40,7 +40,7 @@ int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
         else if (old)
                 ret = -EBUSY;
         else {
-                rcu_assign_pointer(queue_handler[pf], qh);
+                RCU_INIT_POINTER(queue_handler[pf], qh);
                 ret = 0;
         }
         mutex_unlock(&queue_handler_mutex);
@@ -65,7 +65,7 @@ int nf_unregister_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
                 return -EINVAL;
         }
 
-        rcu_assign_pointer(queue_handler[pf], NULL);
+        RCU_INIT_POINTER(queue_handler[pf], NULL);
         mutex_unlock(&queue_handler_mutex);
 
         synchronize_rcu();
@@ -84,7 +84,7 @@ void nf_unregister_queue_handlers(const struct nf_queue_handler *qh)
                                 queue_handler[pf],
                                 lockdep_is_held(&queue_handler_mutex)
                                 ) == qh)
-                        rcu_assign_pointer(queue_handler[pf], NULL);
+                        RCU_INIT_POINTER(queue_handler[pf], NULL);
         }
         mutex_unlock(&queue_handler_mutex);
 
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 1905976b5135..c879c1a2370e 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -59,7 +59,7 @@ int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)
                 nfnl_unlock();
                 return -EBUSY;
         }
-        rcu_assign_pointer(subsys_table[n->subsys_id], n);
+        RCU_INIT_POINTER(subsys_table[n->subsys_id], n);
         nfnl_unlock();
 
         return 0;
@@ -210,7 +210,7 @@ static int __net_init nfnetlink_net_init(struct net *net)
         if (!nfnl)
                 return -ENOMEM;
         net->nfnl_stash = nfnl;
-        rcu_assign_pointer(net->nfnl, nfnl);
+        RCU_INIT_POINTER(net->nfnl, nfnl);
         return 0;
 }
 
@@ -219,7 +219,7 @@ static void __net_exit nfnetlink_net_exit_batch(struct list_head *net_exit_list)
         struct net *net;
 
         list_for_each_entry(net, net_exit_list, exit_list)
-                rcu_assign_pointer(net->nfnl, NULL);
+                RCU_INIT_POINTER(net->nfnl, NULL);
         synchronize_net();
         list_for_each_entry(net, net_exit_list, exit_list)
                 netlink_kernel_release(net->nfnl_stash);