From: Lance Roy <ldr...@gmail.com> 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 <ldr...@gmail.com> Cc: Pablo Neira Ayuso <pa...@netfilter.org> Cc: Jozsef Kadlecsik <kad...@blackhole.kfki.hu> Cc: Florian Westphal <f...@strlen.de> Cc: "David S. Miller" <da...@davemloft.net> Cc: <netfilter-de...@vger.kernel.org> Cc: <coret...@netfilter.org> Cc: <net...@vger.kernel.org> Acked-by: Jozsef Kadlecsik <kad...@blackhole.kfki.hu> Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org> (cherry-picked from commit 4b87dd54be21ad611a1c740f9df0c4376d496e09) https://jira.sw.ru/browse/PSBM-123086 Signed-off-by: Vasily Averin <v...@virtuozzo.com> --- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h index 225348a..a437adf 100644 --- a/net/netfilter/ipset/ip_set_hash_gen.h +++ b/net/netfilter/ipset/ip_set_hash_gen.h @@ -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) -- 1.8.3.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel
