[PATCH RESEND] ipvs: ip_vs_conn_expire_now: Rename del_timer in comment

[PATCH RESEND] ipvs: ip_vs_conn_expire_now: Rename del_timer in comment

[WangYuli]

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

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

[Julian Anastasov]

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

	Looks good to me for nf-next, thanks!

Acked-by: Julian Anastasov <ja@ssi.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@ssi.bg>

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

[Pablo Neira Ayuso]

On Fri, Jul 04, 2025 at 04:35:53PM +0800, 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.

$ git grep del_timer net/netfilter/
net/netfilter/ipvs/ip_vs_lblc.c: *     Julian Anastasov        :    replaced del_timer call with del_timer_sync
net/netfilter/ipvs/ip_vs_lblc.c: *                                   handler and del_timer thread in SMP

Wider search, in the net tree:

net/ipv4/igmp.c: *                                      which caused a "del_timer() called
net/ipv4/igmp.c: *              Christian Daudt :       removed del_timer from

Maybe these are only for historical purpose, so leaving them untouched
is fine.

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

[WangYuli]

[-- Attachment #1.1.1: Type: text/plain, Size: 1106 bytes --]

Hi Pablo Neira Ayuso,

On 2025/7/22 11:25, Pablo Neira Ayuso wrote:
> On Fri, Jul 04, 2025 at 04:35:53PM +0800, 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.
> $ git grep del_timer net/netfilter/
> net/netfilter/ipvs/ip_vs_lblc.c: *     Julian Anastasov        :    replaced del_timer call with del_timer_sync
> net/netfilter/ipvs/ip_vs_lblc.c: *                                   handler and del_timer thread in SMP
>
> Wider search, in the net tree:
>
> net/ipv4/igmp.c: *                                      which caused a "del_timer() called
> net/ipv4/igmp.c: *              Christian Daudt :       removed del_timer from
>
> Maybe these are only for historical purpose, so leaving them untouched
> is fine.
>
I intentionally modified only this part, leaving the other places you 
found untouched.

My goal was to update only the comment for this code block, not the 
file's changelog.


Thanks,

-- 
WangYuli

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 645 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]