Hi Andrei,
On Mon, Jan 30, 2012 at 1:09 PM, Emeltchenko Andrei
<Andrei.Emeltchenko.news@xxxxxxxxx> wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
No commit message? In my opinion all commits should have a commit
message and even more in this patch set that deals with locking in
L2CAP core.
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
> ---
> net/bluetooth/l2cap_core.c | 23 ++++++++++++++++++++++-
> 1 files changed, 22 insertions(+), 1 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 9a23b19..a7e5a55 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -241,7 +241,7 @@ static char *state_to_string(int state)
> return "invalid state";
> }
>
> -static void l2cap_state_change(struct l2cap_chan *chan, int state)
> +static void __l2cap_state_change(struct l2cap_chan *chan, int state)
> {
> BT_DBG("%p %s -> %s", chan, state_to_string(chan->state),
> state_to_string(state));
> @@ -250,6 +250,27 @@ static void l2cap_state_change(struct l2cap_chan *chan, int state)
> chan->ops->state_change(chan->data, state);
> }
>
> +static void l2cap_state_change(struct l2cap_chan *chan, int state)
> +{
> + lock_sock(chan->sk);
> + __l2cap_state_change(chan, state);
> + release_sock(chan->sk);
> +}
Introducing this change now before the others in patch 5 will actually
change how l2cap_state_change works. Won't that cause any problems?
> +static inline void __l2cap_set_sock_err(struct sock *sk, int err)
> +{
> + sk->sk_err = err;
> +}
> +
> +static inline void l2cap_set_sock_err(struct l2cap_chan *chan, int err)
> +{
> + struct sock *sk = chan->sk;
> +
> + lock_sock(sk);
> + __l2cap_set_sock_err(sk, err);
> + release_sock(sk);
> +}
This helper is different because it didn't exist before so I can say
we shall have no problems with it.
> static void l2cap_chan_timeout(struct work_struct *work)
> {
> struct l2cap_chan *chan = container_of(work, struct l2cap_chan,
> --
> 1.7.4.1
Regards,
--
Ulisses Furquim
ProFUSION embedded systems
http://profusion.mobi
Mobile: +55 19 9250 0942
Skype: ulissesffs
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
