From: Jay Vosburgh <fubar@us.ibm.com>
Date: Tue, 6 Nov 2007 21:33:28 +0000 (-0800)
Subject: bonding: fix rtnl locking merge error
X-Git-Tag: v2.6.24-rc3~163^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1466a21997212a5fb33d5da9357841972b28b007;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed