diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-02-17 22:26:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-22 13:19:31 -0500 |
commit | eaefd1105bc431ef329599e307a07f2a36ae7872 (patch) | |
tree | 658eeed417654c8f6015d4d5f957f5a1b5e9521f /include/linux/net.h | |
parent | 04cfa852ff8dab923640500ee850d19e75bacabc (diff) |
net: add __rcu annotations to sk_wq and wq
Add proper RCU annotations/verbs to sk_wq and wq members
Fix __sctp_write_space() sk_sleep() abuse (and sock->wq access)
Fix sunrpc sk_sleep() abuse too
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/net.h')
-rw-r--r-- | include/linux/net.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 16faa130088c..94de83c0f877 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
@@ -118,6 +118,7 @@ enum sock_shutdown_cmd { | |||
118 | }; | 118 | }; |
119 | 119 | ||
120 | struct socket_wq { | 120 | struct socket_wq { |
121 | /* Note: wait MUST be first field of socket_wq */ | ||
121 | wait_queue_head_t wait; | 122 | wait_queue_head_t wait; |
122 | struct fasync_struct *fasync_list; | 123 | struct fasync_struct *fasync_list; |
123 | struct rcu_head rcu; | 124 | struct rcu_head rcu; |
@@ -142,7 +143,7 @@ struct socket { | |||
142 | 143 | ||
143 | unsigned long flags; | 144 | unsigned long flags; |
144 | 145 | ||
145 | struct socket_wq *wq; | 146 | struct socket_wq __rcu *wq; |
146 | 147 | ||
147 | struct file *file; | 148 | struct file *file; |
148 | struct sock *sk; | 149 | struct sock *sk; |