bonding: Convert bond_net_exit_batch_rtnl() to ->exit_rtnl().

bond_net_exit_batch_rtnl() iterates the dying netns list and
performs the same operation for each.

Let's use ->exit_rtnl().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://patch.msgid.link/20250411205258.63164-11-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 950d8e4d86f8b4e9f7a620f315be675f44080f27..bdd36409dd9b5850b58fd80abfaa8cd1b14028a5 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -6558,7 +6558,7 @@ static int __net_init bond_net_init(struct net *net)
 
 /* According to commit 69b0216ac255 ("bonding: fix bonding_masters
  * race condition in bond unloading") we need to remove sysfs files
- * before we remove our devices (done later in bond_net_exit_batch_rtnl())
+ * before we remove our devices (done later in bond_net_exit_rtnl())
  */
 static void __net_exit bond_net_pre_exit(struct net *net)
 {
@@ -6567,25 +6567,20 @@ static void __net_exit bond_net_pre_exit(struct net *net)
        bond_destroy_sysfs(bn);
 }
 
-static void __net_exit bond_net_exit_batch_rtnl(struct list_head *net_list,
-                                               struct list_head *dev_kill_list)
+static void __net_exit bond_net_exit_rtnl(struct net *net,
+                                         struct list_head *dev_kill_list)
 {
-       struct bond_net *bn;
-       struct net *net;
+       struct bond_net *bn = net_generic(net, bond_net_id);
+       struct bonding *bond, *tmp_bond;
 
        /* Kill off any bonds created after unregistering bond rtnl ops */
-       list_for_each_entry(net, net_list, exit_list) {
-               struct bonding *bond, *tmp_bond;
-
-               bn = net_generic(net, bond_net_id);
-               list_for_each_entry_safe(bond, tmp_bond, &bn->dev_list, bond_list)
-                       unregister_netdevice_queue(bond->dev, dev_kill_list);
-       }
+       list_for_each_entry_safe(bond, tmp_bond, &bn->dev_list, bond_list)
+               unregister_netdevice_queue(bond->dev, dev_kill_list);
 }
 
 /* According to commit 23fa5c2caae0 ("bonding: destroy proc directory
  * only after all bonds are gone") bond_destroy_proc_dir() is called
- * after bond_net_exit_batch_rtnl() has completed.
+ * after bond_net_exit_rtnl() has completed.
  */
 static void __net_exit bond_net_exit_batch(struct list_head *net_list)
 {
@@ -6601,7 +6596,7 @@ static void __net_exit bond_net_exit_batch(struct list_head *net_list)
 static struct pernet_operations bond_net_ops = {
        .init = bond_net_init,
        .pre_exit = bond_net_pre_exit,
-       .exit_batch_rtnl = bond_net_exit_batch_rtnl,
+       .exit_rtnl = bond_net_exit_rtnl,
        .exit_batch = bond_net_exit_batch,
        .id   = &bond_net_id,
        .size = sizeof(struct bond_net),