ipvs: reorganize tot_stats

 	The global tot_stats contains cpustats field just like the
stats for dest and svc, so better use it to simplify the usage
in estimation_timer. As tot_stats is registered as estimator
we can remove the special ip_vs_read_cpu_stats call for
tot_stats. Fix ip_vs_read_cpu_stats to be called under
stats lock because it is still used as synchronization between
estimation timer and user context (the stats readers).

 	Also, make sure ip_vs_stats_percpu_show reads properly
the u64 stats from user context.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>

1 files changed, 1 insertions, 2 deletions

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 091ca1f76e0e..9db750d9082d 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -851,8 +851,7 @@ struct netns_ipvs {
         atomic_t                conn_count;      /*  connection counter */
 
         /* ip_vs_ctl */
-        struct ip_vs_stats              *tot_stats;  /* Statistics & est. */
-        struct ip_vs_cpu_stats __percpu *cpustats;   /* Stats per cpu */
+        struct ip_vs_stats              tot_stats;  /* Statistics & est. */
         seqcount_t                      *ustats_seq; /* u64 read retry */
 
         int                     num_services;    /* no of virtual services */