- bonding-fix-assert_rtnl-that-produces-spurious-warnings.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     bonding: fix ASSERT_RTNL that produces spurious warnings
has been removed from the -mm tree.  Its filename was
     bonding-fix-assert_rtnl-that-produces-spurious-warnings.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: bonding: fix ASSERT_RTNL that produces spurious warnings
From: Jay Vosburgh <fubar@xxxxxxxxxx>

Move an ASSERT_RTNL down to where we should hold only RTNL; the existing check
produces spurious warnings because we hold additional locks at _bh, tripping a
debug warning in spin_lock_mutex().

Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/net/bonding/bond_alb.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff -puN drivers/net/bonding/bond_alb.c~bonding-fix-assert_rtnl-that-produces-spurious-warnings drivers/net/bonding/bond_alb.c
--- a/drivers/net/bonding/bond_alb.c~bonding-fix-assert_rtnl-that-produces-spurious-warnings
+++ a/drivers/net/bonding/bond_alb.c
@@ -1601,9 +1601,6 @@ void bond_alb_handle_active_change(struc
 	struct slave *swap_slave;
 	int i;
 
-	if (new_slave)
-		ASSERT_RTNL();
-
 	if (bond->curr_active_slave == new_slave) {
 		return;
 	}
@@ -1649,6 +1646,8 @@ void bond_alb_handle_active_change(struc
 	write_unlock_bh(&bond->curr_slave_lock);
 	read_unlock(&bond->lock);
 
+	ASSERT_RTNL();
+
 	/* curr_active_slave must be set before calling alb_swap_mac_addr */
 	if (swap_slave) {
 		/* swap mac address */
_

Patches currently in -mm which might be from fubar@xxxxxxxxxx are

origin.patch
git-net.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux