From eab3e65d91b52410c7b0b251fa0d8ba8311e4c17 Mon Sep 17 00:00:00 2001 From: Julian Anastasov Date: Tue, 11 Nov 2003 00:06:18 -0800 Subject: [PATCH] [IPVS]: make sure timer expires on one cpu --- net/ipv4/ipvs/ip_vs_conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c index e9e33d9deb078..4d58235c14268 100644 --- a/net/ipv4/ipvs/ip_vs_conn.c +++ b/net/ipv4/ipvs/ip_vs_conn.c @@ -535,8 +535,8 @@ static void ip_vs_conn_expire(unsigned long data) void ip_vs_conn_expire_now(struct ip_vs_conn *cp) { - cp->timeout = 0; - mod_timer(&cp->timer, jiffies); + if (del_timer(&cp->timer)) + mod_timer(&cp->timer, jiffies); __ip_vs_conn_put(cp); } -- 2.53.0