commit fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42
author Peter Zijlstra <a.p.zijlstra@chello.nl> Wed Nov 08 22:44:35 2006 -0800
committer David S. Miller <davem@sunset.davemloft.net> Sat Dec 02 21:21:35 2006 -0800
tree f4450b97bb0cf61d731004f0fbe599662aba0f20
parent 67f83cbf081a70426ff667e8d14f94e13ed3bdca

[BLUETOOTH] lockdep: annotate sk_lock nesting in AF_BLUETOOTH

=============================================
[ INFO: possible recursive locking detected ]
2.6.18-1.2726.fc6 #1

net/bluetooth/l2cap.c

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index bbf78e6..29a8fa4 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -770,7 +770,7 @@
 	long timeo;
 	int err = 0;
 
-	lock_sock(sk);
+	lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
 
 	if (sk->sk_state != BT_LISTEN) {
 		err = -EBADFD;
@@ -792,7 +792,7 @@
 
 		release_sock(sk);
 		timeo = schedule_timeout(timeo);
-		lock_sock(sk);
+		lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
 
 		if (sk->sk_state != BT_LISTEN) {
 			err = -EBADFD;