rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

[mirror_ubuntu-artful-kernel.git] / net / ipv4 / netfilter / nf_nat_sip.c

diff --git a/net/ipv4/netfilter/nf_nat_sip.c b/net/ipv4/netfilter/nf_nat_sip.c
index e40cf7816fdbb4e0088efd200a46cbd3a9041ed2..78844d9208f161d209f161af7d1509a691995dd1 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_sip.c
+++ b/net/ipv4/netfilter/nf_nat_sip.c
@@ -528,13 +528,13 @@ err1:
 
 static void __exit nf_nat_sip_fini(void)
 {
-       rcu_assign_pointer(nf_nat_sip_hook, NULL);
-       rcu_assign_pointer(nf_nat_sip_seq_adjust_hook, NULL);
-       rcu_assign_pointer(nf_nat_sip_expect_hook, NULL);
-       rcu_assign_pointer(nf_nat_sdp_addr_hook, NULL);
-       rcu_assign_pointer(nf_nat_sdp_port_hook, NULL);
-       rcu_assign_pointer(nf_nat_sdp_session_hook, NULL);
-       rcu_assign_pointer(nf_nat_sdp_media_hook, NULL);
+       RCU_INIT_POINTER(nf_nat_sip_hook, NULL);
+       RCU_INIT_POINTER(nf_nat_sip_seq_adjust_hook, NULL);
+       RCU_INIT_POINTER(nf_nat_sip_expect_hook, NULL);
+       RCU_INIT_POINTER(nf_nat_sdp_addr_hook, NULL);
+       RCU_INIT_POINTER(nf_nat_sdp_port_hook, NULL);
+       RCU_INIT_POINTER(nf_nat_sdp_session_hook, NULL);
+       RCU_INIT_POINTER(nf_nat_sdp_media_hook, NULL);
        synchronize_rcu();
 }
 
@@ -547,13 +547,13 @@ static int __init nf_nat_sip_init(void)
        BUG_ON(nf_nat_sdp_port_hook != NULL);
        BUG_ON(nf_nat_sdp_session_hook != NULL);
        BUG_ON(nf_nat_sdp_media_hook != NULL);
-       rcu_assign_pointer(nf_nat_sip_hook, ip_nat_sip);
-       rcu_assign_pointer(nf_nat_sip_seq_adjust_hook, ip_nat_sip_seq_adjust);
-       rcu_assign_pointer(nf_nat_sip_expect_hook, ip_nat_sip_expect);
-       rcu_assign_pointer(nf_nat_sdp_addr_hook, ip_nat_sdp_addr);
-       rcu_assign_pointer(nf_nat_sdp_port_hook, ip_nat_sdp_port);
-       rcu_assign_pointer(nf_nat_sdp_session_hook, ip_nat_sdp_session);
-       rcu_assign_pointer(nf_nat_sdp_media_hook, ip_nat_sdp_media);
+       RCU_INIT_POINTER(nf_nat_sip_hook, ip_nat_sip);
+       RCU_INIT_POINTER(nf_nat_sip_seq_adjust_hook, ip_nat_sip_seq_adjust);
+       RCU_INIT_POINTER(nf_nat_sip_expect_hook, ip_nat_sip_expect);
+       RCU_INIT_POINTER(nf_nat_sdp_addr_hook, ip_nat_sdp_addr);
+       RCU_INIT_POINTER(nf_nat_sdp_port_hook, ip_nat_sdp_port);
+       RCU_INIT_POINTER(nf_nat_sdp_session_hook, ip_nat_sdp_session);
+       RCU_INIT_POINTER(nf_nat_sdp_media_hook, ip_nat_sdp_media);
        return 0;
 }