summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2008-08-11 17:19:14 +1000
committerSven Wegener <sven.wegener@stealer.net>2008-08-11 14:00:55 +0200
commite93615d0866a974afc7148172f8382e2af48c985 (patch)
treef07e57c99390cc3b535c4bf4ae3c3f5a94da1579
parent519e49e888458649dde453d36c08b7f3432525dc (diff)
downloadlinux-3.10-e93615d0866a974afc7148172f8382e2af48c985.tar.gz
linux-3.10-e93615d0866a974afc7148172f8382e2af48c985.tar.bz2
linux-3.10-e93615d0866a974afc7148172f8382e2af48c985.zip
ipvs: Explictly clear ip_vs_stats members
In order to align the coding styles of ip_vs_zero_stats() and its child-function ip_vs_zero_estimator(), clear ip_vs_stats members explicitlty rather than doing a limited memset(). This was chosen over modifying ip_vs_zero_estimator() to use memset() as it is more robust against changes in members in the relevant structures. memset() would be prefered if all members of the structure were to be cleared. Cc: Sven Wegener <sven.wegener@stealer.net> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
-rw-r--r--net/ipv4/ipvs/ip_vs_ctl.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
index cfb1d20993d..6379705a8dc 100644
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
@@ -683,8 +683,21 @@ static void
ip_vs_zero_stats(struct ip_vs_stats *stats)
{
spin_lock_bh(&stats->lock);
- memset(stats, 0, (char *)&stats->lock - (char *)stats);
+
+ stats->conns = 0;
+ stats->inpkts = 0;
+ stats->outpkts = 0;
+ stats->inbytes = 0;
+ stats->outbytes = 0;
+
+ stats->cps = 0;
+ stats->inpps = 0;
+ stats->outpps = 0;
+ stats->inbps = 0;
+ stats->outbps = 0;
+
ip_vs_zero_estimator(stats);
+
spin_unlock_bh(&stats->lock);
}