diff options
author | Julian Anastasov <ja@ssi.bg> | 2005-07-11 20:59:57 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-07-11 20:59:57 -0700 |
commit | af9debd461d10fe582c9c0e80eafa69f698331ed (patch) | |
tree | f9473e1ec1c1ec18bf90ff8049fe63f5abd35ef7 /net/ipv4/ipvs/ip_vs_conn.c | |
parent | f5b8adb4f5767415b7b00e32e4766a052e2ed4cc (diff) | |
download | op-kernel-dev-af9debd461d10fe582c9c0e80eafa69f698331ed.zip op-kernel-dev-af9debd461d10fe582c9c0e80eafa69f698331ed.tar.gz |
[IPVS]: Add and reorder bh locks after moving to keventd.
An addition to the last ipvs changes that move
update_defense_level/si_meminfo to keventd:
- ip_vs_random_dropentry now runs in process context and should use _bh
locks to protect from softirqs
- update_defense_level still needs _bh locks after si_meminfo is called,
for the same purpose
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_conn.c')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_conn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c index 9f16ab3..d0145a8 100644 --- a/net/ipv4/ipvs/ip_vs_conn.c +++ b/net/ipv4/ipvs/ip_vs_conn.c @@ -758,7 +758,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp) return 1; } - +/* Called from keventd and must protect itself from softirqs */ void ip_vs_random_dropentry(void) { int idx; @@ -773,7 +773,7 @@ void ip_vs_random_dropentry(void) /* * Lock is actually needed in this loop. */ - ct_write_lock(hash); + ct_write_lock_bh(hash); list_for_each_entry(cp, &ip_vs_conn_tab[hash], c_list) { if (!cp->cport && !(cp->flags & IP_VS_CONN_F_NO_CPORT)) @@ -806,7 +806,7 @@ void ip_vs_random_dropentry(void) ip_vs_conn_expire_now(cp->control); } } - ct_write_unlock(hash); + ct_write_unlock_bh(hash); } } |