aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2011-03-04 05:28:20 -0500
committerSimon Horman <horms@verge.net.au>2011-03-14 20:36:48 -0400
commit4a569c0c0f833adace1e3aadaa38780ec2fcdf9e (patch)
tree8afd62c6a1db2bdc5934d1122ea645770f3a9b96
parent097fc76a0805bdca17baf12cad9d3bcb215716a9 (diff)
ipvs: remove _bh from percpu stats reading
ip_vs_read_cpu_stats is called only from timer, so no need for _bh locks. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Hans Schillstrom <hans@schillstrom.com> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--net/netfilter/ipvs/ip_vs_est.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
index f560a05c965..88bd71647bf 100644
--- a/net/netfilter/ipvs/ip_vs_est.c
+++ b/net/netfilter/ipvs/ip_vs_est.c
@@ -69,10 +69,10 @@ static void ip_vs_read_cpu_stats(struct ip_vs_stats_user *sum,
69 sum->inpkts += s->ustats.inpkts; 69 sum->inpkts += s->ustats.inpkts;
70 sum->outpkts += s->ustats.outpkts; 70 sum->outpkts += s->ustats.outpkts;
71 do { 71 do {
72 start = u64_stats_fetch_begin_bh(&s->syncp); 72 start = u64_stats_fetch_begin(&s->syncp);
73 inbytes = s->ustats.inbytes; 73 inbytes = s->ustats.inbytes;
74 outbytes = s->ustats.outbytes; 74 outbytes = s->ustats.outbytes;
75 } while (u64_stats_fetch_retry_bh(&s->syncp, start)); 75 } while (u64_stats_fetch_retry(&s->syncp, start));
76 sum->inbytes += inbytes; 76 sum->inbytes += inbytes;
77 sum->outbytes += outbytes; 77 sum->outbytes += outbytes;
78 } else { 78 } else {
@@ -80,10 +80,10 @@ static void ip_vs_read_cpu_stats(struct ip_vs_stats_user *sum,
80 sum->inpkts = s->ustats.inpkts; 80 sum->inpkts = s->ustats.inpkts;
81 sum->outpkts = s->ustats.outpkts; 81 sum->outpkts = s->ustats.outpkts;
82 do { 82 do {
83 start = u64_stats_fetch_begin_bh(&s->syncp); 83 start = u64_stats_fetch_begin(&s->syncp);
84 sum->inbytes = s->ustats.inbytes; 84 sum->inbytes = s->ustats.inbytes;
85 sum->outbytes = s->ustats.outbytes; 85 sum->outbytes = s->ustats.outbytes;
86 } while (u64_stats_fetch_retry_bh(&s->syncp, start)); 86 } while (u64_stats_fetch_retry(&s->syncp, start));
87 } 87 }
88 } 88 }
89} 89}