Commit 4b87dd54 authored Oct 02, 2018 by Lance Roy Committed by Pablo Neira Ayuso Oct 16, 2018

netfilter: Replace spin_is_locked() with lockdep

lockdep_assert_held() is better suited to checking locking requirements,
since it won't get confused when someone else holds the lock. This is
also a step towards possibly removing spin_is_locked().

Signed-off-by: Lance Roy <ldr709@gmail.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Cc: Florian Westphal <fw@strlen.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <netfilter-devel@vger.kernel.org>
Cc: <coreteam@netfilter.org>
Cc: <netdev@vger.kernel.org>
Acked-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent b1871915

net/netfilter/ipset/ip_set_hash_gen.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@

		#define __ipset_dereference_protected(p, c) rcu_dereference_protected(p, c)
		#define ipset_dereference_protected(p, set) \
		__ipset_dereference_protected(p, spin_is_locked(&(set)->lock))
		__ipset_dereference_protected(p, lockdep_is_held(&(set)->lock))

		#define rcu_dereference_bh_nfnl(p) rcu_dereference_bh_check(p, 1)