mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

Bluetooth: Add refcnt to struct l2cap_chan

Browse source 
struct l2cap_chan has now its own refcnt that is compatible with the
socket refcnt, i.e., we won't see sk_refcnt = 0 and chan->refcnt > 0.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan 2011-05-17 14:34:52 -03:00
parent 89bc500e41
commit 71ba0e569b
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -289,6 +289,8 @@ struct l2cap_chan {
__u8 state;
atomic_t refcnt;
__le16 psm;
__u16 dcid;
__u16 scid;

30
net/bluetooth/l2cap_core.c
View file

@ -78,6 +78,18 @@ static void l2cap_send_disconn_req(struct l2cap_conn *conn,
static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb);
/* ---- L2CAP channels ---- */
static inline void chan_hold(struct l2cap_chan *c)
{
atomic_inc(&c->refcnt);
}
static inline void chan_put(struct l2cap_chan *c)
{
if (atomic_dec_and_test(&c->refcnt))
kfree(c);
}
static struct l2cap_chan *__l2cap_get_chan_by_dcid(struct l2cap_conn *conn, u16 cid)
{
struct l2cap_chan *c;
@ -213,7 +225,7 @@ static void l2cap_chan_set_timer(struct l2cap_chan *chan, long timeout)
BT_DBG("chan %p state %d timeout %ld", chan->sk, chan->state, timeout);
if (!mod_timer(&chan->chan_timer, jiffies + timeout))
sock_hold(chan->sk);
chan_hold(chan);
}
static void l2cap_chan_clear_timer(struct l2cap_chan *chan)
@ -221,7 +233,7 @@ static void l2cap_chan_clear_timer(struct l2cap_chan *chan)
BT_DBG("chan %p state %d", chan, chan->state);
if (timer_pending(&chan->chan_timer) && del_timer(&chan->chan_timer))
__sock_put(chan->sk);
chan_put(chan);
}
static void l2cap_state_change(struct l2cap_chan *chan, int state)
@ -244,7 +256,7 @@ static void l2cap_chan_timeout(unsigned long arg)
/* sk is owned by user. Try again later */
l2cap_chan_set_timer(chan, HZ / 5);
bh_unlock_sock(sk);
sock_put(sk);
chan_put(chan);
return;
}
@ -261,7 +273,7 @@ static void l2cap_chan_timeout(unsigned long arg)
bh_unlock_sock(sk);
chan->ops->close(chan->data);
sock_put(sk);
chan_put(chan);
}
struct l2cap_chan *l2cap_chan_create(struct sock *sk)
@ -282,6 +294,8 @@ struct l2cap_chan *l2cap_chan_create(struct sock *sk)
chan->state = BT_OPEN;
atomic_set(&chan->refcnt, 1);
return chan;
}
@ -291,13 +305,11 @@ void l2cap_chan_destroy(struct l2cap_chan *chan)
list_del(&chan->global_l);
write_unlock_bh(&chan_list_lock);
kfree(chan);
chan_put(chan);
}
static void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
{
struct sock *sk = chan->sk;
BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn,
chan->psm, chan->dcid);
@ -328,7 +340,7 @@ static void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
chan->omtu = L2CAP_DEFAULT_MTU;
}
sock_hold(sk);
chan_hold(chan);
list_add(&chan->list, &conn->chan_l);
}
@ -350,7 +362,7 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err)
write_lock_bh(&conn->chan_lock);
list_del(&chan->list);
write_unlock_bh(&conn->chan_lock);
__sock_put(sk);
chan_put(chan);
chan->conn = NULL;
hci_conn_put(conn->hcon);