diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2006-11-09 07:44:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 06:21:35 +0100 |
| commit | fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42 (patch) | |
| tree | f4450b97bb0cf61d731004f0fbe599662aba0f20 /include/net/sock.h | |
| parent | SELinux: Fix SA selection semantics (diff) | |
| download | linux-fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42.tar.xz linux-fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42.zip | |
[BLUETOOTH] lockdep: annotate sk_lock nesting in AF_BLUETOOTH
=============================================
[ INFO: possible recursive locking detected ]
2.6.18-1.2726.fc6 #1
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 9cdbae2a53a3..35ffbdd35d3e 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -745,7 +745,13 @@ static inline int sk_stream_wmem_schedule(struct sock *sk, int size) */ #define sock_owned_by_user(sk) ((sk)->sk_lock.owner) -extern void FASTCALL(lock_sock(struct sock *sk)); +extern void FASTCALL(lock_sock_nested(struct sock *sk, int subclass)); + +static inline void lock_sock(struct sock *sk) +{ + lock_sock_nested(sk, 0); +} + extern void FASTCALL(release_sock(struct sock *sk)); /* BH context may only use the following locking interface. */ |