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

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index bc745d00ea4dd31177445dcc4282afd669a33cb6..9997026b44b2caebcb36c1666e9797fa48045c74 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -387,7 +387,7 @@ struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
 
        if (dst && dst->obsolete && dst->ops->check(dst, cookie) == NULL) {
                sk_tx_queue_clear(sk);
-               rcu_assign_pointer(sk->sk_dst_cache, NULL);
+               RCU_INIT_POINTER(sk->sk_dst_cache, NULL);
                dst_release(dst);
                return NULL;
        }
@@ -1158,7 +1158,7 @@ static void __sk_free(struct sock *sk)
                                       atomic_read(&sk->sk_wmem_alloc) == 0);
        if (filter) {
                sk_filter_uncharge(sk, filter);
-               rcu_assign_pointer(sk->sk_filter, NULL);
+               RCU_INIT_POINTER(sk->sk_filter, NULL);
        }
 
        sock_disable_timestamp(sk, SOCK_TIMESTAMP);