diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2006-11-09 01:44:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:21:35 -0500 |
| commit | fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42 (patch) | |
| tree | f4450b97bb0cf61d731004f0fbe599662aba0f20 /net/bluetooth | |
| parent | 67f83cbf081a70426ff667e8d14f94e13ed3bdca (diff) | |
[BLUETOOTH] lockdep: annotate sk_lock nesting in AF_BLUETOOTH
=============================================
[ INFO: possible recursive locking detected ]
2.6.18-1.2726.fc6 #1
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index bbf78e6a7bc3..29a8fa4d3728 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
| @@ -770,7 +770,7 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int fl | |||
| 770 | long timeo; | 770 | long timeo; |
| 771 | int err = 0; | 771 | int err = 0; |
| 772 | 772 | ||
| 773 | lock_sock(sk); | 773 | lock_sock_nested(sk, SINGLE_DEPTH_NESTING); |
| 774 | 774 | ||
| 775 | if (sk->sk_state != BT_LISTEN) { | 775 | if (sk->sk_state != BT_LISTEN) { |
| 776 | err = -EBADFD; | 776 | err = -EBADFD; |
| @@ -792,7 +792,7 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int fl | |||
| 792 | 792 | ||
| 793 | release_sock(sk); | 793 | release_sock(sk); |
| 794 | timeo = schedule_timeout(timeo); | 794 | timeo = schedule_timeout(timeo); |
| 795 | lock_sock(sk); | 795 | lock_sock_nested(sk, SINGLE_DEPTH_NESTING); |
| 796 | 796 | ||
| 797 | if (sk->sk_state != BT_LISTEN) { | 797 | if (sk->sk_state != BT_LISTEN) { |
| 798 | err = -EBADFD; | 798 | err = -EBADFD; |