From 691aa8163b308402ad3cb1e572e5366ab46ce1e6 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sun, 10 Aug 2008 09:17:59 +0000 Subject: [PATCH] --- yaml --- r: 108360 b: refs/heads/master c: 8ab19ea36c5c5340ff598e4d15fc084eb65671dc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipvs/ip_vs_est.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 74d0b78d14cf..3c7fb8b11290 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc0fde2fad007a81ecffceb25a893a6c3f1ed767 +refs/heads/master: 8ab19ea36c5c5340ff598e4d15fc084eb65671dc diff --git a/trunk/net/ipv4/ipvs/ip_vs_est.c b/trunk/net/ipv4/ipvs/ip_vs_est.c index bc04eedd6dbb..1d6e58e502fd 100644 --- a/trunk/net/ipv4/ipvs/ip_vs_est.c +++ b/trunk/net/ipv4/ipvs/ip_vs_est.c @@ -170,8 +170,11 @@ void ip_vs_kill_estimator(struct ip_vs_stats *stats) kfree(est); killed++; } - if (killed && est_list == NULL) - del_timer_sync(&est_timer); + while (killed && !est_list && try_to_del_timer_sync(&est_timer) < 0) { + write_unlock_bh(&est_lock); + cpu_relax(); + write_lock_bh(&est_lock); + } write_unlock_bh(&est_lock); }