OSDN Git Service

devlink: Simplify devlink_pernet_pre_exit call
authorLeon Romanovsky <leonro@nvidia.com>
Sat, 14 Aug 2021 09:57:26 +0000 (12:57 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sat, 14 Aug 2021 12:59:10 +0000 (13:59 +0100)
The devlink_pernet_pre_exit() will be called if net namespace exits.

That routine is relevant for devlink instances that were assigned to
that namespaces first. This assignment is possible only with the following
command: "devlink reload DEV netns ...", which already checks reload support.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/devlink.c

index ee97873..9e74a95 100644 (file)
@@ -11392,16 +11392,16 @@ static void __net_exit devlink_pernet_pre_exit(struct net *net)
         */
        mutex_lock(&devlink_mutex);
        list_for_each_entry(devlink, &devlink_list, list) {
-               if (net_eq(devlink_net(devlink), net)) {
-                       if (WARN_ON(!devlink_reload_supported(devlink->ops)))
-                               continue;
-                       err = devlink_reload(devlink, &init_net,
-                                            DEVLINK_RELOAD_ACTION_DRIVER_REINIT,
-                                            DEVLINK_RELOAD_LIMIT_UNSPEC,
-                                            &actions_performed, NULL);
-                       if (err && err != -EOPNOTSUPP)
-                               pr_warn("Failed to reload devlink instance into init_net\n");
-               }
+               if (!net_eq(devlink_net(devlink), net))
+                       continue;
+
+               WARN_ON(!devlink_reload_supported(devlink->ops));
+               err = devlink_reload(devlink, &init_net,
+                                    DEVLINK_RELOAD_ACTION_DRIVER_REINIT,
+                                    DEVLINK_RELOAD_LIMIT_UNSPEC,
+                                    &actions_performed, NULL);
+               if (err && err != -EOPNOTSUPP)
+                       pr_warn("Failed to reload devlink instance into init_net\n");
        }
        mutex_unlock(&devlink_mutex);
 }