lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bonding: move active_slave getting into separate function

Browse Source 
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko
2013-10-18 17:43:37 +02:00
committed by David S. Miller
parent 080a06e1a9
commit 752d48b52e
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/bonding/bond_options.c
View File

@@ -57,6 +57,24 @@ int bond_option_mode_set(struct bonding *bond, int mode)
return 0; 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, int bond_option_active_slave_set(struct bonding *bond,
struct net_device *slave_dev) struct net_device *slave_dev)
{ {

8
drivers/net/bonding/bond_sysfs.c
View File

@@ -1219,13 +1219,13 @@ static ssize_t bonding_show_active_slave(struct device *d,
char *buf) char *buf)
{ {
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
struct slave *curr; struct net_device *slave_dev;
int count = 0; int count = 0;
rcu_read_lock(); rcu_read_lock();
curr = rcu_dereference(bond->curr_active_slave); slave_dev = bond_option_active_slave_get_rcu(bond);
if (USES_PRIMARY(bond->params.mode) && curr) if (slave_dev)
count = sprintf(buf, "%s\n", curr->dev->name); count = sprintf(buf, "%s\n", slave_dev->name);
rcu_read_unlock(); rcu_read_unlock();
return count; return count;

2
drivers/net/bonding/bonding.h
View File

@@ -428,6 +428,8 @@ int bond_netlink_init(void);
void bond_netlink_fini(void); void bond_netlink_fini(void);
int bond_option_mode_set(struct bonding *bond, int mode); int bond_option_mode_set(struct bonding *bond, int mode);
int bond_option_active_slave_set(struct bonding *bond, struct net_device *slave_dev); 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 bond_net {
struct net * net; /* Associated network namespace */ struct net * net; /* Associated network namespace */