ipvs: use nf_ct_kill helper
Subsystems (3)
Florian Westphal
maintainerPATCH v2 1/1 ipvs: use nf_ct_kill helper
Once timer is removed from nf_conn struct we cannot open-code the removal sequence anymore.
---
V2: keep debug messages around.
net/netfilter/ipvs/ip_vs_nfct.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
net/netfilter/ipvs/ip_vs_nfct.c +2 -5
@@ -281,13 +281,10 @@ void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp) h =nf_conntrack_find_get (cp->ipvs->net, &nf_ct_zone_dflt, &tuple);if (h) { ct =nf_ct_tuplehash_to_ctrack (h); -/* Show what happens instead of calling nf_ct_kill() */ -if (del_timer (&ct->timeout)) { -IP_VS_DBG (7 ,"%s: ct=%p, deleted conntrack timer for tuple=" +if (nf_ct_kill (ct)) { +IP_VS_DBG (7 ,"%s: ct=%p, deleted conntrack for tuple=" FMT_TUPLE "\n" , __func__, ct,ARG_TUPLE (&tuple)); -if (ct->timeout.function) - ct->timeout.function (ct->timeout.data); }else { IP_VS_DBG(7, "%s: ct=%p, no conntrack timer for tuple=" FMT_TUPLE "\n",
Signature · 1 line
2.7.3
Hello,
Quoted 4 lines · Florian Westphal
Once timer is removed from
nf_connstruct we cannot open-code the removal sequence anymore.Signed-off-by Florian Westphal <[email protected]>
Looks good to me,
Quoted 28 lines
---
V2: keep debug messages around.net/netfilter/ipvs/ip_vs_nfct.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)net/netfilter/ipvs/ip_vs_nfct.c +2
-5@@ -281,13 +281,10 @@ void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp) h =nf_conntrack_find_get (cp->ipvs->net, &nf_ct_zone_dflt, &tuple);if (h) { ct =nf_ct_tuplehash_to_ctrack (h); -/* Show what happens instead of calling nf_ct_kill() */ -if (del_timer (&ct->timeout)) { -IP_VS_DBG (7 ,"%s: ct=%p, deleted conntrack timer for tuple=" +if (nf_ct_kill (ct)) { +IP_VS_DBG (7 ,"%s: ct=%p, deleted conntrack for tuple=" FMT_TUPLE "\n" , __func__, ct,ARG_TUPLE (&tuple)); -if (ct->timeout.function) - ct->timeout.function (ct->timeout.data); }else { IP_VS_DBG(7, "%s: ct=%p, no conntrack timer for tuple=" FMT_TUPLE "\n",Signature · 1 line
2.7.3
Regards
--
Julian Anastasov <[email protected]>
Pablo Neira Ayuso
maintainerQuoted 2 lines · Florian Westphal
Once timer is removed from
nf_connstruct we cannot open-code the removal sequence anymore.
@Simon and other IPVS folks: I'm going to take this patch since Florian needs this merged for follow up patches.
So I'm dealing with this small one.
Thanks.
Simon Horman
maintainerHi Pablo,
Quoted 8 lines · Pablo Neira Ayuso
Quoted 2 lines · Florian Westphal
Once timer is removed from
nf_connstruct we cannot open-code the removal sequence anymore.@Simon and other IPVS folks: I'm going to take this patch since Florian needs this merged for follow up patches.
So I'm dealing with this small one.
Sure, please do.