Re: [PATCH nf-next v2] ipvs: use nf_ct_kill helper

[Julian Anastasov <ja@xxxxxx>]

        Hello,

On Wed, 3 Aug 2016, Florian Westphal wrote:

> Once timer is removed from nf_conn struct we cannot open-code
> the removal sequence anymore.
> 
> Signed-off-by: Florian Westphal <fw@xxxxxxxxx>

        Looks good to me,

Acked-by: Julian Anastasov <ja@xxxxxx>

> ---
>  V2: keep debug messages around.
> 
>  net/netfilter/ipvs/ip_vs_nfct.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c
> index f04fd8d..fc230d9 100644
> --- a/net/netfilter/ipvs/ip_vs_nfct.c
> +++ b/net/netfilter/ipvs/ip_vs_nfct.c
> @@ -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",
> -- 
> 2.7.3

Regards

--
Julian Anastasov <ja@xxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html