Commit cbf6ab67 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller
Browse files

devlink: Simplify devlink_pernet_pre_exit call 



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: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38e3bfa8

net/core/devlink.c

+10 −10
Original line number Diff line number Diff line
@@ -11392,9 +11392,10 @@ 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)))

		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,
@@ -11402,7 +11403,6 @@ static void __net_exit devlink_pernet_pre_exit(struct net *net) 
		if (err && err != -EOPNOTSUPP)

			pr_warn("Failed to reload devlink instance into init_net\n");

	}

	}

	mutex_unlock(&devlink_mutex);

}