From a670a3625214a788dfcd826a79f0b1e69446de7c Mon Sep 17 00:00:00 2001 From: "nikolay@redhat.com" Date: Sat, 18 May 2013 01:18:28 +0000 Subject: [PATCH] --- yaml --- r: 376115 b: refs/heads/master c: ea6836dd7ef9cfbed5dce421190009f9eed00b7e h: refs/heads/master i: 376113: 621655a74e1f6ec76bbca6fb80be25d92970aff0 376111: b8d0a710a1012c12e67ca1d81cc123839da8e607 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_sysfs.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a513ad8282e6..10eee648ee1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff0102ee104847023c36357e2b9f133f3f40d211 +refs/heads/master: ea6836dd7ef9cfbed5dce421190009f9eed00b7e diff --git a/trunk/drivers/net/bonding/bond_sysfs.c b/trunk/drivers/net/bonding/bond_sysfs.c index ea7a388f4843..77ea237de900 100644 --- a/trunk/drivers/net/bonding/bond_sysfs.c +++ b/trunk/drivers/net/bonding/bond_sysfs.c @@ -316,6 +316,9 @@ static ssize_t bonding_store_mode(struct device *d, int new_value, ret = count; struct bonding *bond = to_bond(d); + if (!rtnl_trylock()) + return restart_syscall(); + if (bond->dev->flags & IFF_UP) { pr_err("unable to update mode of %s because interface is up.\n", bond->dev->name); @@ -352,6 +355,7 @@ static ssize_t bonding_store_mode(struct device *d, bond->dev->name, bond_mode_tbl[new_value].modename, new_value); out: + rtnl_unlock(); return ret; } static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,