Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Lance Roy and committed by
Pablo Neira Ayuso
4b87dd54 b1871915

+1 -1
+1 -1
net/netfilter/ipset/ip_set_hash_gen.h
··· 15 15 16 16 #define __ipset_dereference_protected(p, c) rcu_dereference_protected(p, c) 17 17 #define ipset_dereference_protected(p, set) \ 18 - __ipset_dereference_protected(p, spin_is_locked(&(set)->lock)) 18 + __ipset_dereference_protected(p, lockdep_is_held(&(set)->lock)) 19 19 20 20 #define rcu_dereference_bh_nfnl(p) rcu_dereference_bh_check(p, 1) 21 21