[patch net-next 06/11] net: devlink: don't take devlink_mutex for devlink_compat_*

[Jiri Pirko]

From: Jiri Pirko <j...@mellanox.com>

The netdevice is guaranteed to not disappear so we can rely that
devlink_port and devlink won't disappear as well. No need to take
devlink_mutex so don't take it here.

Signed-off-by: Jiri Pirko <j...@mellanox.com>
---
 net/core/devlink.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 3dc51ddf7451..1e125c3b890c 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -6444,17 +6444,15 @@ void devlink_compat_running_version(struct net_device 
*dev,
        dev_hold(dev);
        rtnl_unlock();
 
-       mutex_lock(&devlink_mutex);
        devlink = netdev_to_devlink(dev);
        if (!devlink || !devlink->ops->info_get)
-               goto unlock_list;
+               goto out;
 
        mutex_lock(&devlink->lock);
        __devlink_compat_running_version(devlink, buf, len);
        mutex_unlock(&devlink->lock);
-unlock_list:
-       mutex_unlock(&devlink_mutex);
 
+out:
        rtnl_lock();
        dev_put(dev);
 }
@@ -6462,22 +6460,22 @@ void devlink_compat_running_version(struct net_device 
*dev,
 int devlink_compat_flash_update(struct net_device *dev, const char *file_name)
 {
        struct devlink *devlink;
-       int ret = -EOPNOTSUPP;
+       int ret;
 
        dev_hold(dev);
        rtnl_unlock();
 
-       mutex_lock(&devlink_mutex);
        devlink = netdev_to_devlink(dev);
-       if (!devlink || !devlink->ops->flash_update)
-               goto unlock_list;
+       if (!devlink || !devlink->ops->flash_update) {
+               ret = -EOPNOTSUPP;
+               goto out;
+       }
 
        mutex_lock(&devlink->lock);
        ret = devlink->ops->flash_update(devlink, file_name, NULL, NULL);
        mutex_unlock(&devlink->lock);
-unlock_list:
-       mutex_unlock(&devlink_mutex);
 
+out:
        rtnl_lock();
        dev_put(dev);
 
-- 
2.17.2