netfilter: nf_conntrack: use mod_timer_pending() for conntrack refresh
authorPatrick McHardy <kaber@trash.net>
Sat, 13 Jun 2009 10:21:49 +0000 (12:21 +0200)
committerPatrick McHardy <kaber@trash.net>
Sat, 13 Jun 2009 10:21:49 +0000 (12:21 +0200)
commit65cb9fda32be613216f601a330b311c3bd7a8436
tree3ba0ae9cbd474723f47e5ea8f1d21e212381c135
parent266d07cb1c9a0c345d7d3aea889f92062894059e
netfilter: nf_conntrack: use mod_timer_pending() for conntrack refresh

Use mod_timer_pending() instead of atomic sequence of del_timer()/
add_timer(). mod_timer_pending() does not rearm an inactive timer,
so we don't need the conntrack lock anymore to make sure we don't
accidentally rearm a timer of a conntrack which is in the process
of being destroyed.

With this change, we don't need to take the global lock anymore at all,
counter updates can be performed under the per-conntrack lock.

Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/nf_conntrack_core.c