From: Gustavo Padovan <padovan@profusion.mobi>
To: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCHv1 14/14] Bluetooth: Remove socket lock check
Date: Tue, 21 Feb 2012 15:51:47 -0200 [thread overview]
Message-ID: <20120221175147.GB22229@joana> (raw)
In-Reply-To: <1329821707-11817-15-git-send-email-Andrei.Emeltchenko.news@gmail.com>
Hi Andrei,
* Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-02-21 12:55:07 +0200]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Simplify code so that we do not need to check whether socket is locked.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/l2cap_sock.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
> index bbc1747..e2fc24b 100644
> --- a/net/bluetooth/l2cap_sock.c
> +++ b/net/bluetooth/l2cap_sock.c
> @@ -125,15 +125,15 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
>
> err = l2cap_chan_connect(chan, la.l2_psm, la.l2_cid, &la.l2_bdaddr);
> if (err)
> - goto done;
> + return err;
>
> lock_sock(sk);
>
> err = bt_sock_wait_state(sk, BT_CONNECTED,
> sock_sndtimeo(sk, flags & O_NONBLOCK));
> -done:
> - if (sock_owned_by_user(sk))
> - release_sock(sk);
> +
> + release_sock(sk);
> +
> return err;
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
Gustavo
next prev parent reply other threads:[~2012-02-21 17:51 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 10:54 [PATCHv1 00/14] Bluetooth: Change socket lock to l2cap_chan lock Andrei Emeltchenko
2012-02-21 10:54 ` [PATCHv1 01/14] Bluetooth: trivial: Fix long line Andrei Emeltchenko
2012-02-21 10:54 ` [PATCHv1 02/14] Bluetooth: Revert to mutexes from RCU list Andrei Emeltchenko
2012-02-21 10:54 ` [PATCHv1 03/14] Bluetooth: Add l2cap_chan_lock Andrei Emeltchenko
2012-02-21 16:51 ` Ulisses Furquim
2012-02-21 17:25 ` Gustavo Padovan
2012-02-21 10:54 ` [PATCHv1 04/14] Bluetooth: Add locked and unlocked state_change Andrei Emeltchenko
2012-02-21 16:52 ` Ulisses Furquim
2012-02-21 17:26 ` Gustavo Padovan
2012-02-21 10:54 ` [PATCHv1 05/14] Bluetooth: Add socket error function Andrei Emeltchenko
2012-02-21 16:57 ` Ulisses Furquim
2012-02-21 17:27 ` Gustavo Padovan
2012-02-21 10:54 ` [PATCHv1 06/14] Bluetooth: Add unlocked __l2cap_chan_add function Andrei Emeltchenko
2012-02-21 17:01 ` Ulisses Furquim
2012-02-22 9:25 ` Andrei Emeltchenko
2012-02-21 17:28 ` Gustavo Padovan
2012-02-21 10:55 ` [PATCHv1 07/14] Bluetooth: Use chan lock in timers Andrei Emeltchenko
2012-02-21 17:06 ` Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 08/14] Bluetooth: Use chan lock in L2CAP sig commands Andrei Emeltchenko
2012-02-21 17:18 ` Ulisses Furquim
2012-02-21 17:57 ` Gustavo Padovan
2012-02-21 10:55 ` [PATCHv1 09/14] Bluetooth: Use chan lock in L2CAP conn start Andrei Emeltchenko
2012-02-21 17:20 ` Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 10/14] Bluetooth: Use chan lock in receiving data Andrei Emeltchenko
2012-02-21 20:28 ` Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 11/14] Bluetooth: Change locking logic for conn/chan ready Andrei Emeltchenko
2012-02-21 17:31 ` Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 12/14] Bluetooth: Change locking logic in security_cfm Andrei Emeltchenko
2012-02-21 17:32 ` Ulisses Furquim
2012-02-21 17:56 ` Gustavo Padovan
2012-02-21 20:44 ` Andrei Emeltchenko
2012-02-21 21:18 ` Ulisses Furquim
2012-02-21 10:55 ` [PATCHv1 13/14] Bluetooth: Use l2cap chan lock in socket connect Andrei Emeltchenko
2012-02-21 17:36 ` Ulisses Furquim
2012-02-21 17:46 ` Gustavo Padovan
2012-02-22 9:53 ` Andrei Emeltchenko
2012-02-21 10:55 ` [PATCHv1 14/14] Bluetooth: Remove socket lock check Andrei Emeltchenko
2012-02-21 17:37 ` Ulisses Furquim
2012-02-22 9:59 ` Andrei Emeltchenko
2012-02-21 17:51 ` Gustavo Padovan [this message]
2012-02-21 19:24 ` [PATCHv1 00/14] Bluetooth: Change socket lock to l2cap_chan lock Johan Hedberg
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=20120221175147.GB22229@joana \
--to=padovan@profusion.mobi \
--cc=Andrei.Emeltchenko.news@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).