Commits
Andrey Mirkin authored and Pavel Emelyanov committed 5a889e32263
CPT: fix restore of conntrack expect timer One more fix of restore conntrack procedure. Following code: if (ct->helper->timeout && !del_timer(&exp->timeout)) { ... } can lead to oops, as exp->timeout is not initialized at this point. Actually this optimization is not needed at all. If expectation is dying, then we will let it die by its own death. Also in ip_conntrack_expect_insert() there is an initialization of exp->timeout. And we can't just do add_timer() after that (as in add_timer() we have BUG_ON(timer_pending(timer))), we must do mod_timer() instead. Signed-off-by: Pavel Emelyanov <xemul@openvz.org>