Re: [PATCH 1/2] fix lockdep warning
From: Julian Anastasov <ja@ssi.bg>
Date: 2011-10-04 22:51:31
Also in:
lvs-devel, netfilter-devel
Hello, On Mon, 3 Oct 2011, Hans Schillstrom wrote:
quoted hunk ↗ jump to hunk
From: Hans Schillstrom <redacted> rs_lock needs a key to make lock dep happy. Signed-off-by: Hans Schillstrom <redacted>diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 2b771dc..a1af72f 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c@@ -57,6 +57,7 @@ static DEFINE_MUTEX(__ip_vs_mutex); /* lock for service table */ static DEFINE_RWLOCK(__ip_vs_svc_lock); +static struct lock_class_key ip_vs_rs_key;
ip_vs_rs_key remains unused without debugging. I don't remember the reason why IPVS is the only place that calls __rwlock_init instead of rwlock_init. Can we use rwlock_init?
quoted hunk ↗ jump to hunk
/* sysctl variables */@@ -3680,6 +3681,7 @@ int __net_init ip_vs_control_net_init(struct net *net) struct netns_ipvs *ipvs = net_ipvs(net); ipvs->rs_lock = __RW_LOCK_UNLOCKED(ipvs->rs_lock); + __rwlock_init(&ipvs->rs_lock, "ipvs->rs_lock", &ip_vs_rs_key); /* Initialize rs_table */ for (idx = 0; idx < IP_VS_RTAB_SIZE; idx++)-- 1.7.4.4
Regards -- Julian Anastasov [off-list ref]