bonding: move active_slave getting into separate function

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 24 insertions, 4 deletions

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 09af5d10d43a..9a5223c7b4d1 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -57,6 +57,24 @@ int bond_option_mode_set(struct bonding *bond, int mode)
         return 0;
 }
 
+static struct net_device *__bond_option_active_slave_get(struct bonding *bond,
+                                                         struct slave *slave)
+{
+        return USES_PRIMARY(bond->params.mode) && slave ? slave->dev : NULL;
+}
+
+struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond)
+{
+        struct slave *slave = rcu_dereference(bond->curr_active_slave);
+
+        return __bond_option_active_slave_get(bond, slave);
+}
+
+struct net_device *bond_option_active_slave_get(struct bonding *bond)
+{
+        return __bond_option_active_slave_get(bond, bond->curr_active_slave);
+}
+
 int bond_option_active_slave_set(struct bonding *bond,
                                  struct net_device *slave_dev)
 {
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index abd260047103..47749c970a01 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1219,13 +1219,13 @@ static ssize_t bonding_show_active_slave(struct device *d,
                                          char *buf)
 {
         struct bonding *bond = to_bond(d);
-        struct slave *curr;
+        struct net_device *slave_dev;
         int count = 0;
 
         rcu_read_lock();
-        curr = rcu_dereference(bond->curr_active_slave);
-        if (USES_PRIMARY(bond->params.mode) && curr)
-                count = sprintf(buf, "%s\n", curr->dev->name);
+        slave_dev = bond_option_active_slave_get_rcu(bond);
+        if (slave_dev)
+                count = sprintf(buf, "%s\n", slave_dev->name);
         rcu_read_unlock();
 
         return count;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 686759dce4c6..046a60535e04 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -428,6 +428,8 @@ int bond_netlink_init(void);
 void bond_netlink_fini(void);
 int bond_option_mode_set(struct bonding *bond, int mode);
 int bond_option_active_slave_set(struct bonding *bond, struct net_device *slave_dev);
+struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond);
+struct net_device *bond_option_active_slave_get(struct bonding *bond);
 
 struct bond_net {
         struct net *            net;    /* Associated network namespace */