diff options
author | Simon Horman <horms@verge.net.au> | 2010-08-25 22:54:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-26 16:21:29 -0400 |
commit | 4f72816ef07fdf49338ee0e6764a3961d552994a (patch) | |
tree | 172f3ce232a280c4d28eb2576676d060c9ef6c4c /net | |
parent | bd144550489270a32a531e84a2b4bb6882096236 (diff) |
IPVS: convert __ip_vs_securetcp_lock to a spinlock
Also rename __ip_vs_securetcp_lock to ip_vs_securetcp_lock.
Spinlock conversion was suggested by Eric Dumazet.
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 53a88af22503..8ca1a474eed6 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c | |||
@@ -61,7 +61,7 @@ static DEFINE_RWLOCK(__ip_vs_svc_lock); | |||
61 | static DEFINE_RWLOCK(__ip_vs_rs_lock); | 61 | static DEFINE_RWLOCK(__ip_vs_rs_lock); |
62 | 62 | ||
63 | /* lock for state and timeout tables */ | 63 | /* lock for state and timeout tables */ |
64 | static DEFINE_RWLOCK(__ip_vs_securetcp_lock); | 64 | static DEFINE_SPINLOCK(ip_vs_securetcp_lock); |
65 | 65 | ||
66 | /* lock for drop entry handling */ | 66 | /* lock for drop entry handling */ |
67 | static DEFINE_SPINLOCK(__ip_vs_dropentry_lock); | 67 | static DEFINE_SPINLOCK(__ip_vs_dropentry_lock); |
@@ -204,7 +204,7 @@ static void update_defense_level(void) | |||
204 | spin_unlock(&__ip_vs_droppacket_lock); | 204 | spin_unlock(&__ip_vs_droppacket_lock); |
205 | 205 | ||
206 | /* secure_tcp */ | 206 | /* secure_tcp */ |
207 | write_lock(&__ip_vs_securetcp_lock); | 207 | spin_lock(&ip_vs_securetcp_lock); |
208 | switch (sysctl_ip_vs_secure_tcp) { | 208 | switch (sysctl_ip_vs_secure_tcp) { |
209 | case 0: | 209 | case 0: |
210 | if (old_secure_tcp >= 2) | 210 | if (old_secure_tcp >= 2) |
@@ -238,7 +238,7 @@ static void update_defense_level(void) | |||
238 | old_secure_tcp = sysctl_ip_vs_secure_tcp; | 238 | old_secure_tcp = sysctl_ip_vs_secure_tcp; |
239 | if (to_change >= 0) | 239 | if (to_change >= 0) |
240 | ip_vs_protocol_timeout_change(sysctl_ip_vs_secure_tcp>1); | 240 | ip_vs_protocol_timeout_change(sysctl_ip_vs_secure_tcp>1); |
241 | write_unlock(&__ip_vs_securetcp_lock); | 241 | spin_unlock(&ip_vs_securetcp_lock); |
242 | 242 | ||
243 | local_bh_enable(); | 243 | local_bh_enable(); |
244 | } | 244 | } |