From: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv2 10/10] Bluetooth: Remove socket lock check
Date: Fri, 3 Feb 2012 16:36:29 +0200 [thread overview]
Message-ID: <1328279789-10870-11-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1328279789-10870-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
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 ddac4cb..358975a 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;
}
--
1.7.8.3
prev parent reply other threads:[~2012-02-03 14:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 14:36 [RFCv2 00/10] Bluetooth: Change socket lock to l2cap_chan lock Emeltchenko Andrei
2012-02-03 14:36 ` [RFCv2 01/10] Bluetooth: Change chan_ready param from sk to chan Emeltchenko Andrei
2012-02-03 16:04 ` Marcel Holtmann
2012-02-03 14:36 ` [RFCv2 02/10] Bluetooth: Clean up l2cap_chan_add Emeltchenko Andrei
2012-02-03 16:04 ` Marcel Holtmann
2012-02-03 14:36 ` [RFCv2 03/10] Bluetooth: Remove unneeded sk variable Emeltchenko Andrei
2012-02-03 16:05 ` Marcel Holtmann
2012-02-03 14:36 ` [RFCv2 04/10] Bluetooth: Revert to mutexes from RCU list Emeltchenko Andrei
2012-02-03 16:06 ` Marcel Holtmann
2012-02-03 21:14 ` Ulisses Furquim
2012-02-06 10:44 ` Emeltchenko Andrei
2012-02-03 14:36 ` [RFCv2 05/10] Bluetooth: Add l2cap_chan_lock Emeltchenko Andrei
2012-02-03 16:07 ` Marcel Holtmann
2012-02-03 14:36 ` [RFCv2 06/10] Bluetooth: Add locked and unlocked state_change Emeltchenko Andrei
2012-02-03 16:08 ` Marcel Holtmann
2012-02-03 14:36 ` [RFCv2 07/10] Bluetooth: Add socket error function Emeltchenko Andrei
2012-02-03 16:09 ` Marcel Holtmann
2012-02-03 14:36 ` [RFCv2 08/10] Bluetooth: Change socket lock to chan lock Emeltchenko Andrei
2012-02-03 14:36 ` [RFCv2 09/10] Bluetooth: Use l2cap chan lock in socket connect Emeltchenko Andrei
2012-02-03 14:36 ` Emeltchenko Andrei [this message]
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=1328279789-10870-11-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=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).