Hi guys, here come a couple of fixes and cleanups for IPVS. Worth mentioning are the two possible deadlock fixes. One introduced by my last sync daemon work, which hasn't hit any stable kernel yet. The other one is in the estimator code and goes back to at leat since we started working with git for the kernel. The latter I think qualifies for -stable. I've pushed the changes (8123b42..2e45552) based on davem's net tree here git://git.stealer.net/linux-2.6.git stealer/ipvs/for-davem Sven Wegener (9): ipvs: Fix possible deadlock in sync code ipvs: Fix possible deadlock in estimator code ipvs: Use ARRAY_SIZE() ipvs: Use list_empty() instead of open-coding the same functionality ipvs: Initialize schedulers' struct list_head at compile time ipvs: Annotate init functions with __init ipvs: Mark net_vs_ctl_path const ipvs: Embed estimator object into stats object ipvs: No need to zero out ip_vs_stats during initialization include/net/ip_vs.h | 26 ++++++++-- net/ipv4/ipvs/ip_vs_app.c | 2 +- net/ipv4/ipvs/ip_vs_conn.c | 2 +- net/ipv4/ipvs/ip_vs_ctl.c | 12 ++-- net/ipv4/ipvs/ip_vs_dh.c | 2 +- net/ipv4/ipvs/ip_vs_est.c | 116 ++++++++++++++---------------------------- net/ipv4/ipvs/ip_vs_lblc.c | 2 +- net/ipv4/ipvs/ip_vs_lblcr.c | 2 +- net/ipv4/ipvs/ip_vs_lc.c | 2 +- net/ipv4/ipvs/ip_vs_nq.c | 2 +- net/ipv4/ipvs/ip_vs_proto.c | 2 +- net/ipv4/ipvs/ip_vs_rr.c | 2 +- net/ipv4/ipvs/ip_vs_sched.c | 4 +- net/ipv4/ipvs/ip_vs_sed.c | 2 +- net/ipv4/ipvs/ip_vs_sh.c | 2 +- net/ipv4/ipvs/ip_vs_sync.c | 4 +- net/ipv4/ipvs/ip_vs_wlc.c | 2 +- net/ipv4/ipvs/ip_vs_wrr.c | 2 +- 18 files changed, 84 insertions(+), 104 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe lvs-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html