From b8586ab31841193feaa085b2ac0c28821edbb5aa Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sun, 10 Aug 2008 18:24:41 +0000 Subject: [PATCH] --- yaml --- r: 108367 b: refs/heads/master c: 519e49e888458649dde453d36c08b7f3432525dc h: refs/heads/master i: 108365: d6547459d2ba3284a21717f7c68ccd560820bd5c 108363: 9c2695adbcb9cb956f949d407819df8f22770d14 108359: 559c6fa7a3a36a1a4ee9692061f67a71afa39f68 108351: bffb0076efef9f8f2dfc6d3f51b78281fd81c603 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipvs/ip_vs_ctl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bdf82e756c74..e9bf4cb1c817 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a14a313f9b406c37ab7e3f855b060eb8587b8c7 +refs/heads/master: 519e49e888458649dde453d36c08b7f3432525dc diff --git a/trunk/net/ipv4/ipvs/ip_vs_ctl.c b/trunk/net/ipv4/ipvs/ip_vs_ctl.c index d651bce05493..cfb1d20993d1 100644 --- a/trunk/net/ipv4/ipvs/ip_vs_ctl.c +++ b/trunk/net/ipv4/ipvs/ip_vs_ctl.c @@ -1784,7 +1784,9 @@ static const struct file_operations ip_vs_info_fops = { #endif -struct ip_vs_stats ip_vs_stats; +struct ip_vs_stats ip_vs_stats = { + .lock = __SPIN_LOCK_UNLOCKED(ip_vs_stats.lock), +}; #ifdef CONFIG_PROC_FS static int ip_vs_stats_show(struct seq_file *seq, void *v) @@ -2333,8 +2335,6 @@ int __init ip_vs_control_init(void) INIT_LIST_HEAD(&ip_vs_rtable[idx]); } - memset(&ip_vs_stats, 0, sizeof(ip_vs_stats)); - spin_lock_init(&ip_vs_stats.lock); ip_vs_new_estimator(&ip_vs_stats); /* Hook the defense timer */