diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2017-03-16 18:32:42 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-17 05:29:20 +0100 |
commit | d12c917691b45d9dffcfe7c2362d25caa40905fd (patch) | |
tree | f2e7a8d5f346f39bc220147fcfc5b3a70c9f8999 /net/bridge/br_fdb.c | |
parent | rxrpc: Ignore BUSY packets on old calls (diff) | |
download | linux-d12c917691b45d9dffcfe7c2362d25caa40905fd.tar.xz linux-d12c917691b45d9dffcfe7c2362d25caa40905fd.zip |
bridge: resolve a false alarm of lockdep
Andrei reported a false alarm of lockdep at net/bridge/br_fdb.c:109,
this is because in Andrei's case, a spin_bug() was already triggered
before this, therefore the debug_locks is turned off, lockdep_is_held()
is no longer accurate after that. We should use lockdep_assert_held_once()
instead of lockdep_is_held() to respect debug_locks.
Fixes: 410b3d48f5111 ("bridge: fdb: add proper lock checks in searching functions")
Reported-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_fdb.c')
-rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 4f598dc2d916..6e08b7199dd7 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -106,7 +106,7 @@ static struct net_bridge_fdb_entry *br_fdb_find(struct net_bridge *br, struct hlist_head *head = &br->hash[br_mac_hash(addr, vid)]; struct net_bridge_fdb_entry *fdb; - WARN_ON_ONCE(!br_hash_lock_held(br)); + lockdep_assert_held_once(&br->hash_lock); rcu_read_lock(); fdb = fdb_find_rcu(head, addr, vid); |