net-sysfs: trigger netlink notification on ifalias change via sysfs
authorRoopa Prabhu <roopa@cumulusnetworks.com>
Tue, 14 Nov 2017 07:21:36 +0000 (23:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Nov 2017 13:03:21 +0000 (22:03 +0900)
This patch adds netlink notifications on iflias changes via sysfs.
makes it consistent with the netlink path which also calls
netdev_state_change. Also makes it consistent with other sysfs
netdev_store operations.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/net-sysfs.c

index 51d5836d8fb993d0103c8f395100a43dbf9d5317..799b75268291a2564b3ed83dabdee20c35cb1e16 100644 (file)
@@ -382,7 +382,7 @@ static ssize_t ifalias_store(struct device *dev, struct device_attribute *attr,
        struct net_device *netdev = to_net_dev(dev);
        struct net *net = dev_net(netdev);
        size_t count = len;
-       ssize_t ret;
+       ssize_t ret = 0;
 
        if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
                return -EPERM;
@@ -391,9 +391,20 @@ static ssize_t ifalias_store(struct device *dev, struct device_attribute *attr,
        if (len >  0 && buf[len - 1] == '\n')
                --count;
 
-       ret = dev_set_alias(netdev, buf, count);
+       if (!rtnl_trylock())
+               return restart_syscall();
+
+       if (dev_isalive(netdev)) {
+               ret = dev_set_alias(netdev, buf, count);
+               if (ret < 0)
+                       goto err;
+               ret = len;
+               netdev_state_change(netdev);
+       }
+err:
+       rtnl_unlock();
 
-       return ret < 0 ? ret : len;
+       return ret;
 }
 
 static ssize_t ifalias_show(struct device *dev,