linux-kernel - Re: [PATCH RESEND] ipvs: ip_vs_conn_expire_now: Rename del

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <3dbee3f4-8670-b72c-e5b0-3a108b5ded04@ssi.bg>
Date: Fri, 4 Jul 2025 12:52:57 +0300 (EEST)
From: Julian Anastasov <ja@....bg>
To: WangYuli <wangyuli@...ontech.com>
cc: Simon Horman <horms@...ge.net.au>, pablo@...filter.org,
        kadlec@...filter.org, netdev@...r.kernel.org,
        lvs-devel@...r.kernel.org, netfilter-devel@...r.kernel.org,
        coreteam@...filter.org, linux-kernel <linux-kernel@...r.kernel.org>,
        zhanjun@...ontech.com, niecheng1@...ontech.com,
        guanwentao@...ontech.com, wangyuli@...udflare.getdeepin.org
Subject: Re: [PATCH RESEND] ipvs: ip_vs_conn_expire_now: Rename del_timer in
 comment


	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@...ontech.com>

	Looks good to me for nf-next, thanks!

Acked-by: Julian Anastasov <ja@....bg>

> ---
>  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@....bg>