On Tue, 2 Oct 2018, Lance Roy wrote: > 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@xxxxxxxxx> > Cc: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> > Cc: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > Cc: Florian Westphal <fw@xxxxxxxxx> > Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> > Cc: <netfilter-devel@xxxxxxxxxxxxxxx> > Cc: <coreteam@xxxxxxxxxxxxx> > Cc: <netdev@xxxxxxxxxxxxxxx> > --- > net/netfilter/ipset/ip_set_hash_gen.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> Best regards, Jozsef > diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h > index 8a33dac4e805..e287da68d5fa 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) > > -- > 2.19.0 > > - E-mail : kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxxxxxx PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary
