diff options
| author |   Nikolay Aleksandrov <nikolay@redhat.com> | 2014-01-22 14:53:37 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-01-22 15:38:44 -0800 |
| commit | 3df011625135fa1c670cb8e24618fc7ca38e00b0 (patch) | |
| tree | ea2b9dcd8d94be3cace8fc3bb73934989d601f09 /drivers/net/bonding/bond_sysfs.c | |
| parent | bonding: convert queue_id to use the new option API (diff) | |
| download | linux-dev-3df011625135fa1c670cb8e24618fc7ca38e00b0.tar.xz linux-dev-3df011625135fa1c670cb8e24618fc7ca38e00b0.zip | |
bonding: convert all_slaves_active to use the new option API
This patch adds the necessary changes so all_slaves_active would use
the new bonding option API.
Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_sysfs.c')
| -rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index a9cd3f514c8c..20210d29e86b 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -1015,22 +1015,13 @@ static ssize_t bonding_store_slaves_active(struct device *d, const char *buf, size_t count) { struct bonding *bond = to_bond(d); - int new_value, ret; - - if (sscanf(buf, "%d", &new_value) != 1) { - pr_err("%s: no all_slaves_active value specified.\n", - bond->dev->name); - return -EINVAL; - } - - if (!rtnl_trylock()) - return restart_syscall(); + int ret; - ret = bond_option_all_slaves_active_set(bond, new_value); + ret = bond_opt_tryset_rtnl(bond, BOND_OPT_ALL_SLAVES_ACTIVE, + (char *)buf); if (!ret) ret = count; - rtnl_unlock(); return ret; } static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR, |