]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
bonding: fix rtnl locking merge error
authorJay Vosburgh <fubar@us.ibm.com>
Tue, 6 Nov 2007 21:33:28 +0000 (13:33 -0800)
committerJeff Garzik <jeff@garzik.org>
Sat, 10 Nov 2007 09:25:14 +0000 (04:25 -0500)
commit1466a21997212a5fb33d5da9357841972b28b007
tree7c3968cf2b8780d08c4518f5e638534e7b7994c6
parenta5e68c02fe4d8dff2ff3c5212f9f67082849cc4b
bonding: fix rtnl locking merge error

Looks like I incorrectly merged one of the rtnl lock changes,
so that one function, bonding_show_active_slave, held rtnl but didn't
release it, and another, bonding_store_active_slave, never held rtnl but
did release it.

Fixed so the first function doesn't mess with rtnl, and the
second correctly acquires and releases rtnl.

Bug reported by Moni Shoua <monis@voltaire.com>

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/bonding/bond_sysfs.c