From: "Gustavo F. Padovan" <padovan@profusion.mobi>
To: linux-bluetooth@vger.kernel.org
Cc: "Gustavo F. Padovan" <padovan@profusion.mobi>
Subject: [PATCH 3/5] Bluetooth: Remove *_bh locks from SCO
Date: Tue, 27 Dec 2011 15:28:46 -0200 [thread overview]
Message-ID: <1325006928-3338-3-git-send-email-padovan@profusion.mobi> (raw)
In-Reply-To: <1325006928-3338-2-git-send-email-padovan@profusion.mobi>
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Those locks are not shared between interrupt and process context anymore,
so remove the part that disable interrupts. We are still safe because
preemption is disabled.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---
net/bluetooth/sco.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 0d59e61..471283e 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -482,7 +482,7 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
goto done;
}
- write_lock_bh(&sco_sk_list.lock);
+ write_lock(&sco_sk_list.lock);
if (bacmp(src, BDADDR_ANY) && __sco_get_sock_by_addr(src)) {
err = -EADDRINUSE;
@@ -492,7 +492,7 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
sk->sk_state = BT_BOUND;
}
- write_unlock_bh(&sco_sk_list.lock);
+ write_unlock(&sco_sk_list.lock);
done:
release_sock(sk);
@@ -965,14 +965,14 @@ static int sco_debugfs_show(struct seq_file *f, void *p)
struct sock *sk;
struct hlist_node *node;
- read_lock_bh(&sco_sk_list.lock);
+ read_lock(&sco_sk_list.lock);
sk_for_each(sk, node, &sco_sk_list.head) {
seq_printf(f, "%s %s %d\n", batostr(&bt_sk(sk)->src),
batostr(&bt_sk(sk)->dst), sk->sk_state);
}
- read_unlock_bh(&sco_sk_list.lock);
+ read_unlock(&sco_sk_list.lock);
return 0;
}
--
1.7.7.5
next prev parent reply other threads:[~2011-12-27 17:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-27 17:28 [PATCH 1/5] Bluetooth: Fix context in rfcomm_sock_lock Gustavo F. Padovan
2011-12-27 17:28 ` [PATCH 2/5] Bluetooth: Fix context in RFCOMM tty Gustavo F. Padovan
2011-12-27 17:28 ` Gustavo F. Padovan [this message]
2011-12-27 17:28 ` [PATCH 4/5] Bluetooth: Remove local_bh_disable() from hci_sock.c Gustavo F. Padovan
2011-12-27 17:28 ` [PATCH 5/5] Bluetooth: Remove *_bh from socket list lock Gustavo F. Padovan
2012-01-02 22:21 ` Marcel Holtmann
2012-01-02 22:20 ` [PATCH 3/5] Bluetooth: Remove *_bh locks from SCO Marcel Holtmann
2012-01-02 22:19 ` [PATCH 2/5] Bluetooth: Fix context in RFCOMM tty Marcel Holtmann
2012-01-02 22:18 ` [PATCH 1/5] Bluetooth: Fix context in rfcomm_sock_lock Marcel Holtmann
2012-01-03 0:18 ` Gustavo Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1325006928-3338-3-git-send-email-padovan@profusion.mobi \
--to=padovan@profusion.mobi \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox