bond: Add support for multiple network namespaces

Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index f924a0bcf8da..a59094f8bb6b 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -35,6 +35,8 @@
 #include <linux/rtnetlink.h>
 #include <linux/etherdevice.h>
 #include <net/net_namespace.h>
+#include <net/netns/generic.h>
+#include <linux/nsproxy.h>
 
 #include "bonding.h"
 
@@ -47,12 +49,14 @@
  */
 static ssize_t bonding_show_bonds(struct class *cls, char *buf)
 {
+        struct net *net = current->nsproxy->net_ns;
+        struct bond_net *bn = net_generic(net, bond_net_id);
         int res = 0;
         struct bonding *bond;
 
         rtnl_lock();
 
-        list_for_each_entry(bond, &bond_dev_list, bond_list) {
+        list_for_each_entry(bond, &bn->dev_list, bond_list) {
                 if (res > (PAGE_SIZE - IFNAMSIZ)) {
                         /* not enough space for another interface name */
                         if ((PAGE_SIZE - res) > 10)
@@ -69,11 +73,12 @@ static ssize_t bonding_show_bonds(struct class *cls, char *buf)
         return res;
 }
 
-static struct net_device *bond_get_by_name(const char *ifname)
+static struct net_device *bond_get_by_name(struct net *net, const char *ifname)
 {
+        struct bond_net *bn = net_generic(net, bond_net_id);
         struct bonding *bond;
 
-        list_for_each_entry(bond, &bond_dev_list, bond_list) {
+        list_for_each_entry(bond, &bn->dev_list, bond_list) {
                 if (strncmp(bond->dev->name, ifname, IFNAMSIZ) == 0)
                         return bond->dev;
         }
@@ -91,6 +96,7 @@ static struct net_device *bond_get_by_name(const char *ifname)
 static ssize_t bonding_store_bonds(struct class *cls,
                                    const char *buffer, size_t count)
 {
+        struct net *net = current->nsproxy->net_ns;
         char command[IFNAMSIZ + 1] = {0, };
         char *ifname;
         int rv, res = count;
@@ -104,7 +110,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
         if (command[0] == '+') {
                 pr_info(DRV_NAME
                         ": %s is being created...\n", ifname);
-                rv = bond_create(ifname);
+                rv = bond_create(net, ifname);
                 if (rv) {
                         pr_info(DRV_NAME ": Bond creation failed.\n");
                         res = rv;
@@ -113,7 +119,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
                 struct net_device *bond_dev;
 
                 rtnl_lock();
-                bond_dev = bond_get_by_name(ifname);
+                bond_dev = bond_get_by_name(net, ifname);
                 if (bond_dev) {
                         pr_info(DRV_NAME ": %s is being deleted...\n",
                                 ifname);
@@ -238,8 +244,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                 /* Got a slave name in ifname.  Is it already in the list? */
                 found = 0;
 
-                /* FIXME: get netns from sysfs object */
-                dev = __dev_get_by_name(&init_net, ifname);
+                dev = __dev_get_by_name(dev_net(bond->dev), ifname);
                 if (!dev) {
                         pr_info(DRV_NAME
                                ": %s: Interface %s does not exist!\n",