Prev: [008/145] memcg: fix oom killing a child process in an other cgroup
Next: [049/145] SCSI: qla2xxx: Obtain proper host structure during response-queue processing.
From: Greg KH on 12 Mar 2010 20:00
2.6.32-stable review patch. If anyone has any objections, please let me know.

----------------
From: Eric W. Biederman <ebiederm(a)xmission.com>

[ Upstream commit b8afe6416101549e877f8470f2a160df69676166 ]

The wireless sysfs methods like the rest of the networking sysfs
methods are removed with the rtnl_lock held and block until
the existing methods stop executing. So use rtnl_trylock
and restart_syscall so that the code continues to work.

Signed-off-by: Eric W. Biederman <ebiederm(a)xmission.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
net/core/net-sysfs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -366,7 +366,8 @@ static ssize_t wireless_show(struct devi
const struct iw_statistics *iw;
ssize_t ret = -EINVAL;

- rtnl_lock();
+ if (!rtnl_trylock())
+ return restart_syscall();
if (dev_isalive(dev)) {
iw = get_wireless_stats(dev);
if (iw)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [008/145] memcg: fix oom killing a child process in an other cgroup
Next: [049/145] SCSI: qla2xxx: Obtain proper host structure during response-queue processing.