---

yaml --- r: 132129 b: refs/heads/master c: 5a5990d h: refs/heads/master i: 132127: c8764d4 v: v3
git-mirror · Mar 3, 2009 · 4d0c7bc · 4d0c7bc
1 parent 8c3279c
commit 4d0c7bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07555c9880da3e2e96e5eae00a03b44cc076deaf
+refs/heads/master: 5a5990d3090b03745a9548a6f5edef02095675cf
diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c
@@ -77,7 +77,9 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,
 	if (endp == buf)
 		goto err;
 
-	rtnl_lock();
+	if (!rtnl_trylock())
+		return -ERESTARTSYS;
+
 	if (dev_isalive(net)) {
 		if ((ret = (*set)(net, new)) == 0)
 			ret = len;