From: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv3 03/16] Bluetooth: Do not use sk lock in get_chan functions
Date: Thu, 9 Feb 2012 16:17:24 +0200 [thread overview]
Message-ID: <1328797057-26331-4-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1328797057-26331-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
When needed we take explicit lock.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index ae08944..dcf4792 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -105,9 +105,8 @@ static struct l2cap_chan *l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 ci
mutex_lock(&conn->chan_lock);
c = __l2cap_get_chan_by_scid(conn, cid);
- if (c)
- lock_sock(c->sk);
mutex_unlock(&conn->chan_lock);
+
return c;
}
@@ -128,9 +127,8 @@ static inline struct l2cap_chan *l2cap_get_chan_by_ident(struct l2cap_conn *conn
mutex_lock(&conn->chan_lock);
c = __l2cap_get_chan_by_ident(conn, ident);
- if (c)
- lock_sock(c->sk);
mutex_unlock(&conn->chan_lock);
+
return c;
}
--
1.7.8.3
next prev parent reply other threads:[~2012-02-09 14:17 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 14:17 [RFCv3 00/16] Bluetooth: Change socket lock to l2cap_chan lock Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 01/16] Bluetooth: trivial: Fix long line Emeltchenko Andrei
2012-02-09 14:26 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 02/16] Bluetooth: Revert to mutexes from RCU list Emeltchenko Andrei
2012-02-09 14:27 ` Marcel Holtmann
2012-02-09 17:54 ` Ulisses Furquim
2012-02-10 8:09 ` Emeltchenko Andrei
2012-02-09 18:37 ` Gustavo Padovan
2012-02-09 18:48 ` Ulisses Furquim
2012-02-09 14:17 ` Emeltchenko Andrei [this message]
2012-02-09 14:28 ` [RFCv3 03/16] Bluetooth: Do not use sk lock in get_chan functions Marcel Holtmann
2012-02-09 14:40 ` Emeltchenko Andrei
2012-02-09 18:08 ` Gustavo Padovan
2012-02-09 18:33 ` Ulisses Furquim
2012-02-10 8:16 ` Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 04/16] Bluetooth: Add l2cap_chan_lock Emeltchenko Andrei
2012-02-09 19:24 ` Gustavo Padovan
2012-02-10 8:39 ` Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 05/16] Bluetooth: Add locked and unlocked state_change Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 06/16] Bluetooth: Add socket error function Emeltchenko Andrei
2012-02-09 14:30 ` Marcel Holtmann
2012-02-09 18:13 ` Gustavo Padovan
2012-02-10 8:46 ` Emeltchenko Andrei
2012-02-10 12:40 ` Gustavo Padovan
2012-02-09 14:17 ` [RFCv3 07/16] Bluetooth: Add unlocked __l2cap_chan_add function Emeltchenko Andrei
2012-02-09 14:31 ` Marcel Holtmann
2012-02-09 17:54 ` Ulisses Furquim
2012-02-10 8:53 ` Emeltchenko Andrei
2012-02-09 14:17 ` [RFCv3 08/16] Bluetooth: Use chan lock in timers Emeltchenko Andrei
2012-02-09 14:33 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 09/16] Bluetooth: Use chan lock in L2CAP sig commands Emeltchenko Andrei
2012-02-09 14:35 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 10/16] Bluetooth: Use chan lock in chan delete functions Emeltchenko Andrei
2012-02-09 14:36 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 11/16] Bluetooth: Use chan lock in L2CAP conn start Emeltchenko Andrei
2012-02-09 14:37 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 12/16] Bluetooth: Use chan lock in receiving data Emeltchenko Andrei
2012-02-09 14:38 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 13/16] Bluetooth: Change locking logic for conn/chan ready Emeltchenko Andrei
2012-02-09 14:39 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 14/16] Bluetooth: Change locking logic in security_cfm Emeltchenko Andrei
2012-02-09 14:40 ` Marcel Holtmann
2012-02-09 14:17 ` [RFCv3 15/16] Bluetooth: Use l2cap chan lock in socket connect Emeltchenko Andrei
2012-02-09 14:42 ` Marcel Holtmann
2012-02-09 18:25 ` Ulisses Furquim
2012-02-10 9:18 ` Emeltchenko Andrei
2012-02-10 18:31 ` Ulisses Furquim
2012-02-13 8:47 ` Emeltchenko Andrei
2012-02-14 1:12 ` Ulisses Furquim
2012-02-09 14:17 ` [RFCv3 16/16] Bluetooth: Remove socket lock check Emeltchenko Andrei
2012-02-09 14:43 ` Marcel Holtmann
2012-02-09 14:50 ` Emeltchenko Andrei
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=1328797057-26331-4-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).