From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - bonding-dont-hold-lock-when-calling-rtnl_unlock.patch removed from -mm tree Date: Mon, 21 Jan 2008 15:14:29 -0800 Message-ID: <200801212314.m0LNETi5025001@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:51466 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760115AbYAUXTG (ORCPT ); Mon, 21 Jan 2008 18:19:06 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: fubar@us.ibm.com, mshiokawa@miraclelinux.com, mm-commits@vger.kernel.org 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 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 , who included a different patch. Signed-off-by: Jay Vosburgh Signed-off-by: Andrew Morton --- 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@us.ibm.com are origin.patch git-net.patch