diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-02-18 03:26:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-22 10:19:31 -0800 |
| commit | eaefd1105bc431ef329599e307a07f2a36ae7872 (patch) | |
| tree | 658eeed417654c8f6015d4d5f957f5a1b5e9521f /include/linux/net.h | |
| parent | 04cfa852ff8dab923640500ee850d19e75bacabc (diff) | |
| download | linux-stable-eaefd1105bc431ef329599e307a07f2a36ae7872.tar.gz linux-stable-eaefd1105bc431ef329599e307a07f2a36ae7872.tar.bz2 linux-stable-eaefd1105bc431ef329599e307a07f2a36ae7872.zip | |
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 { }; struct socket_wq { + /* Note: wait MUST be first field of socket_wq */ wait_queue_head_t wait; struct fasync_struct *fasync_list; struct rcu_head rcu; @@ -142,7 +143,7 @@ struct socket { unsigned long flags; - struct socket_wq *wq; + struct socket_wq __rcu *wq; struct file *file; struct sock *sk; |