Commit 94c3cc00 authored by Wensong Zhang's avatar Wensong Zhang Committed by David S. Miller

[IPV4/IPVS]: Deactivate the timer in connection expire if it is activated by other users

parent 55e61717
...@@ -507,6 +507,10 @@ static void ip_vs_conn_expire(unsigned long data) ...@@ -507,6 +507,10 @@ static void ip_vs_conn_expire(unsigned long data)
* refcnt==1 implies I'm the only one referrer * refcnt==1 implies I'm the only one referrer
*/ */
if (likely(atomic_read(&cp->refcnt) == 1)) { if (likely(atomic_read(&cp->refcnt) == 1)) {
/* delete the timer if it is activated by other users */
if (timer_pending(&cp->timer))
del_timer(&cp->timer);
/* does anybody control me? */ /* does anybody control me? */
if (cp->control) if (cp->control)
ip_vs_control_del(cp); ip_vs_control_del(cp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment