dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Bluetooth: convert chan_lock to mutex 

spin lock doesn't fit ok anymore on the new code based on workqueues.

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan 2011-12-09 04:45:12 -02:00
parent 67d0dfb5ec
commit d01b2ff4e6
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/l2cap.h
View File

@ -536,7 +536,7 @@ struct l2cap_conn {
struct smp_chan *smp_chan; struct smp_chan *smp_chan;
struct list_head chan_l; struct list_head chan_l;
rwlock_t chan_lock; struct mutex chan_lock;
}; };
#define L2CAP_INFO_CL_MTU_REQ_SENT 0x01 #define L2CAP_INFO_CL_MTU_REQ_SENT 0x01

52
net/bluetooth/l2cap_core.c
View File

@ -115,11 +115,11 @@ static struct l2cap_chan *l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 ci
{ {
struct l2cap_chan *c; struct l2cap_chan *c;
read_lock(&conn->chan_lock); mutex_lock(&conn->chan_lock);
c = __l2cap_get_chan_by_scid(conn, cid); c = __l2cap_get_chan_by_scid(conn, cid);
if (c) if (c)
lock_sock(c->sk); lock_sock(c->sk);
read_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
return c; return c;
} }
@ -138,11 +138,11 @@ static inline struct l2cap_chan *l2cap_get_chan_by_ident(struct l2cap_conn *conn
{ {
struct l2cap_chan *c; struct l2cap_chan *c;
read_lock(&conn->chan_lock); mutex_lock(&conn->chan_lock);
c = __l2cap_get_chan_by_ident(conn, ident); c = __l2cap_get_chan_by_ident(conn, ident);
if (c) if (c)
lock_sock(c->sk); lock_sock(c->sk);
read_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
return c; return c;
} }
@ -381,9 +381,9 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err)
if (conn) { if (conn) {
/* Delete from channel list */ /* Delete from channel list */
write_lock_bh(&conn->chan_lock); mutex_lock(&conn->chan_lock);
list_del(&chan->list); list_del(&chan->list);
write_unlock_bh(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
chan_put(chan); chan_put(chan);
chan->conn = NULL; chan->conn = NULL;
@ -754,7 +754,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
BT_DBG("conn %p", conn); BT_DBG("conn %p", conn);
read_lock(&conn->chan_lock); mutex_lock(&conn->chan_lock);
list_for_each_entry_safe(chan, tmp, &conn->chan_l, list) { list_for_each_entry_safe(chan, tmp, &conn->chan_l, list) {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
@ -780,9 +780,9 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
&chan->conf_state)) { &chan->conf_state)) {
/* l2cap_chan_close() calls list_del(chan) /* l2cap_chan_close() calls list_del(chan)
* so release the lock */ * so release the lock */
read_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
l2cap_chan_close(chan, ECONNRESET); l2cap_chan_close(chan, ECONNRESET);
read_lock(&conn->chan_lock); utex_lock(&conn->chan_lock);
bh_unlock_sock(sk); bh_unlock_sock(sk);
continue; continue;
} }
@ -838,7 +838,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
bh_unlock_sock(sk); bh_unlock_sock(sk);
} }
read_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
} }
/* Find socket with cid and source bdaddr. /* Find socket with cid and source bdaddr.
@ -903,7 +903,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
sk = chan->sk; sk = chan->sk;
write_lock_bh(&conn->chan_lock); mutex_lock(&conn->chan_lock);
hci_conn_hold(conn->hcon); hci_conn_hold(conn->hcon);
@ -919,7 +919,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
l2cap_state_change(chan, BT_CONNECTED); l2cap_state_change(chan, BT_CONNECTED);
parent->sk_data_ready(parent, 0); parent->sk_data_ready(parent, 0);
write_unlock_bh(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
clean: clean:
release_sock(parent); release_sock(parent);
@ -954,7 +954,7 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
if (conn->hcon->out && conn->hcon->type == LE_LINK) if (conn->hcon->out && conn->hcon->type == LE_LINK)
smp_conn_security(conn, conn->hcon->pending_sec_level); smp_conn_security(conn, conn->hcon->pending_sec_level);
read_lock(&conn->chan_lock); mutex_lock(&conn->chan_lock);
list_for_each_entry(chan, &conn->chan_l, list) { list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
@ -976,7 +976,7 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
bh_unlock_sock(sk); bh_unlock_sock(sk);
} }
read_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
} }
/* Notify sockets that we cannot guaranty reliability anymore */ /* Notify sockets that we cannot guaranty reliability anymore */
@ -986,7 +986,7 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err)
BT_DBG("conn %p", conn); BT_DBG("conn %p", conn);
read_lock(&conn->chan_lock); mutex_lock(&conn->chan_lock);
list_for_each_entry(chan, &conn->chan_l, list) { list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
@ -995,7 +995,7 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err)
sk->sk_err = err; sk->sk_err = err;
} }
read_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
} }
static void l2cap_info_timeout(unsigned long arg) static void l2cap_info_timeout(unsigned long arg)
@ -1086,7 +1086,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status)
conn->feat_mask = 0; conn->feat_mask = 0;
spin_lock_init(&conn->lock); spin_lock_init(&conn->lock);
rwlock_init(&conn->chan_lock); mutex_init(&conn->chan_lock);
INIT_LIST_HEAD(&conn->chan_l); INIT_LIST_HEAD(&conn->chan_l);
@ -1104,9 +1104,9 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon, u8 status)
static inline void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan) static inline void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
{ {
write_lock_bh(&conn->chan_lock); mutex_lock(&conn->chan_lock);
__l2cap_chan_add(conn, chan); __l2cap_chan_add(conn, chan);
write_unlock_bh(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
} }
/* ---- Socket interface ---- */ /* ---- Socket interface ---- */
@ -1771,7 +1771,7 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
BT_DBG("conn %p", conn); BT_DBG("conn %p", conn);
read_lock(&conn->chan_lock); mutex_lock(&conn->chan_lock);
list_for_each_entry(chan, &conn->chan_l, list) { list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
if (chan->chan_type != L2CAP_CHAN_RAW) if (chan->chan_type != L2CAP_CHAN_RAW)
@ -1787,7 +1787,7 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
if (chan->ops->recv(chan->data, nskb)) if (chan->ops->recv(chan->data, nskb))
kfree_skb(nskb); kfree_skb(nskb);
} }
read_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
} }
/* ---- L2CAP signalling commands ---- */ /* ---- L2CAP signalling commands ---- */
@ -2587,11 +2587,11 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
sk = chan->sk; sk = chan->sk;
write_lock_bh(&conn->chan_lock); mutex_lock(&conn->chan_lock);
/* Check if we already have channel with that dcid */ /* Check if we already have channel with that dcid */
if (__l2cap_get_chan_by_dcid(conn, scid)) { if (__l2cap_get_chan_by_dcid(conn, scid)) {
write_unlock_bh(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
sock_set_flag(sk, SOCK_ZAPPED); sock_set_flag(sk, SOCK_ZAPPED);
chan->ops->close(chan->data); chan->ops->close(chan->data);
goto response; goto response;
@ -2637,7 +2637,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
status = L2CAP_CS_NO_INFO; status = L2CAP_CS_NO_INFO;
} }
write_unlock_bh(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
response: response:
release_sock(parent); release_sock(parent);
@ -4474,7 +4474,7 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
del_timer(&conn->security_timer); del_timer(&conn->security_timer);
} }
read_lock(&conn->chan_lock); mutex_lock(&conn->chan_lock);
list_for_each_entry(chan, &conn->chan_l, list) { list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
@ -4554,7 +4554,7 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
bh_unlock_sock(sk); bh_unlock_sock(sk);
} }
read_unlock(&conn->chan_lock); mutex_unlock(&conn->chan_lock);
return 0; return 0;
} }