[IPVS]: make sure timer expires on one cpu

diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index e9e33d9deb07827e0e1869d4938ade5e6141d78f..4d58235c14268753f3868116d1d0702201f00227 100644 (file)
--- 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);
 }