summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2006-11-08 22:44:35 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:21:35 -0800
commitfcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42 (patch)
treef4450b97bb0cf61d731004f0fbe599662aba0f20 /net/bluetooth
parent67f83cbf081a70426ff667e8d14f94e13ed3bdca (diff)
downloadlinux-fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42.tar.gz
linux-fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42.tar.bz2
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 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap.c4
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
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 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int fl
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;