diff options
| author | Hannes Frederic Sowa | 2016-04-08 15:11:27 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-04-14 04:37:20 +0200 |
| commit | fafc4e1ea1a4c1eb13a30c9426fb799f5efacbc3 (patch) | |
| tree | 643293e7032e9c3534e4de33d2a6820e75886f7d /net/bluetooth | |
| parent | net: ethernet: stmmac: GMAC4.xx: Fix TX descriptor preparation (diff) | |
| download | kernel-qcow2-linux-fafc4e1ea1a4c1eb13a30c9426fb799f5efacbc3.tar.gz kernel-qcow2-linux-fafc4e1ea1a4c1eb13a30c9426fb799f5efacbc3.tar.xz kernel-qcow2-linux-fafc4e1ea1a4c1eb13a30c9426fb799f5efacbc3.zip | |
sock: tigthen lockdep checks for sock_owned_by_user
sock_owned_by_user should not be used without socket lock held. It seems
to be a common practice to check .owned before lock reclassification, so
provide a little help to abstract this check away.
Cc: linux-cifs@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 955eda93e66f..3df7aefb7663 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -65,7 +65,7 @@ static const char *const bt_slock_key_strings[BT_MAX_PROTO] = { void bt_sock_reclassify_lock(struct sock *sk, int proto) { BUG_ON(!sk); - BUG_ON(sock_owned_by_user(sk)); + BUG_ON(!sock_allow_reclassification(sk)); sock_lock_init_class_and_name(sk, bt_slock_key_strings[proto], &bt_slock_key[proto], |