Skip to content

Commit

Permalink
Bluetooth: Fix context in rfcomm_sock_lock
Browse files Browse the repository at this point in the history
Code now run in process context, does not need to disable interrupt
anymore.

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
Gustavo F. Padovan committed Jan 3, 2012
1 parent 9219b2a commit 95ca83f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions net/bluetooth/rfcomm/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr
goto done;
}

write_lock_bh(&rfcomm_sk_list.lock);
write_lock(&rfcomm_sk_list.lock);

if (sa->rc_channel && __rfcomm_get_sock_by_addr(sa->rc_channel, &sa->rc_bdaddr)) {
err = -EADDRINUSE;
Expand All @@ -381,7 +381,7 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr
sk->sk_state = BT_BOUND;
}

write_unlock_bh(&rfcomm_sk_list.lock);
write_unlock(&rfcomm_sk_list.lock);

done:
release_sock(sk);
Expand Down Expand Up @@ -455,7 +455,7 @@ static int rfcomm_sock_listen(struct socket *sock, int backlog)

err = -EINVAL;

write_lock_bh(&rfcomm_sk_list.lock);
write_lock(&rfcomm_sk_list.lock);

for (channel = 1; channel < 31; channel++)
if (!__rfcomm_get_sock_by_addr(channel, src)) {
Expand All @@ -464,7 +464,7 @@ static int rfcomm_sock_listen(struct socket *sock, int backlog)
break;
}

write_unlock_bh(&rfcomm_sk_list.lock);
write_unlock(&rfcomm_sk_list.lock);

if (err < 0)
goto done;
Expand Down Expand Up @@ -982,7 +982,7 @@ static int rfcomm_sock_debugfs_show(struct seq_file *f, void *p)
struct sock *sk;
struct hlist_node *node;

read_lock_bh(&rfcomm_sk_list.lock);
read_lock(&rfcomm_sk_list.lock);

sk_for_each(sk, node, &rfcomm_sk_list.head) {
seq_printf(f, "%s %s %d %d\n",
Expand All @@ -991,7 +991,7 @@ static int rfcomm_sock_debugfs_show(struct seq_file *f, void *p)
sk->sk_state, rfcomm_pi(sk)->channel);
}

read_unlock_bh(&rfcomm_sk_list.lock);
read_unlock(&rfcomm_sk_list.lock);

return 0;
}
Expand Down

0 comments on commit 95ca83f

Please sign in to comment.