diff options
author | Christoph Hellwig <hch@lst.de> | 2018-07-30 03:45:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-31 15:40:22 -0400 |
commit | e6476c21447c4b17c47e476aade6facf050f31e8 (patch) | |
tree | 894a26efd117c5d984796c47fe8e4c4ed3b41872 /include/net/sock.h | |
parent | d46eeeaf99bcfab884e3d658e2ba1356939ea783 (diff) |
net: remove bogus RCU annotations on socket.wq
We never use RCU protection for it, just a lot of cargo-cult
rcu_deference_protects calls.
Note that we do keep the kfree_rcu call for it, as the references through
struct sock are RCU protected and thus might require a grace period before
freeing.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 2afea5d1bdfe..433f45fc2d68 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1788,7 +1788,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent) | |||
1788 | { | 1788 | { |
1789 | WARN_ON(parent->sk); | 1789 | WARN_ON(parent->sk); |
1790 | write_lock_bh(&sk->sk_callback_lock); | 1790 | write_lock_bh(&sk->sk_callback_lock); |
1791 | sk->sk_wq = parent->wq; | 1791 | rcu_assign_pointer(sk->sk_wq, parent->wq); |
1792 | parent->sk = sk; | 1792 | parent->sk = sk; |
1793 | sk_set_socket(sk, parent); | 1793 | sk_set_socket(sk, parent); |
1794 | sk->sk_uid = SOCK_INODE(parent)->i_uid; | 1794 | sk->sk_uid = SOCK_INODE(parent)->i_uid; |