The patch titled
bonding: don't hold lock when calling rtnl_unlock
has been removed from the -mm tree. Its filename was
bonding-dont-hold-lock-when-calling-rtnl_unlock.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: don't hold lock when calling rtnl_unlock
From: Jay Vosburgh <fubar@xxxxxxxxxx>
Change bond_mii_monitor to not hold any locks when calling rtnl_unlock,
as rtnl_unlock can sleep (when acquring another mutex in netdev_run_todo).
Bug reported by Makito SHIOKAWA <mshiokawa@xxxxxxxxxxxxxxxx>, who
included a different patch.
Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/bonding/bond_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/net/bonding/bond_main.c~bonding-dont-hold-lock-when-calling-rtnl_unlock drivers/net/bonding/bond_main.c
--- a/drivers/net/bonding/bond_main.c~bonding-dont-hold-lock-when-calling-rtnl_unlock
+++ a/drivers/net/bonding/bond_main.c
@@ -2386,7 +2386,9 @@ void bond_mii_monitor(struct work_struct
rtnl_lock();
read_lock(&bond->lock);
__bond_mii_monitor(bond, 1);
- rtnl_unlock();
+ read_unlock(&bond->lock);
+ rtnl_unlock(); /* might sleep, hold no other locks */
+ read_lock(&bond->lock);
}
delay = ((bond->params.miimon * HZ) / 1000) ? : 1;
_
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
