LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

Re: [PATCH RESEND] ipvs: ip_vs_conn_expire_now: Rename del_timer in comm

To: WangYuli <wangyuli@xxxxxxxxxxxxx>
Subject: Re: [PATCH RESEND] ipvs: ip_vs_conn_expire_now: Rename del_timer in comment
Cc: Simon Horman <horms@xxxxxxxxxxxx>, pablo@xxxxxxxxxxxxx, kadlec@xxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, lvs-devel@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx, coreteam@xxxxxxxxxxxxx, linux-kernel <linux-kernel@xxxxxxxxxxxxxxx>, zhanjun@xxxxxxxxxxxxx, niecheng1@xxxxxxxxxxxxx, guanwentao@xxxxxxxxxxxxx, wangyuli@xxxxxxxxxxxxxxxxxxxxxxxx
From: Julian Anastasov <ja@xxxxxx>
Date: Fri, 4 Jul 2025 12:52:57 +0300 (EEST)
        Hello,

On Fri, 4 Jul 2025, WangYuli wrote:

> Commit 8fa7292fee5c ("treewide: Switch/rename to timer_delete[_sync]()")
> switched del_timer to timer_delete, but did not modify the comment for
> ip_vs_conn_expire_now(). Now fix it.
> 
> Signed-off-by: WangYuli <wangyuli@xxxxxxxxxxxxx>

        Looks good to me for nf-next, thanks!

Acked-by: Julian Anastasov <ja@xxxxxx>

> ---
>  net/netfilter/ipvs/ip_vs_conn.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
> index 44b2ad695c15..965f3c8e5089 100644
> --- a/net/netfilter/ipvs/ip_vs_conn.c
> +++ b/net/netfilter/ipvs/ip_vs_conn.c
> @@ -926,7 +926,7 @@ static void ip_vs_conn_expire(struct timer_list *t)
>  void ip_vs_conn_expire_now(struct ip_vs_conn *cp)
>  {
>       /* Using mod_timer_pending will ensure the timer is not
> -      * modified after the final del_timer in ip_vs_conn_expire.
> +      * modified after the final timer_delete in ip_vs_conn_expire.
>        */
>       if (timer_pending(&cp->timer) &&
>           time_after(cp->timer.expires, jiffies))
> -- 
> 2.50.0

Regards

--
Julian Anastasov <ja@xxxxxx>



<Prev in Thread] Current Thread [Next in Thread>