Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751987AbXARGce (ORCPT ); Thu, 18 Jan 2007 01:32:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751984AbXARGce (ORCPT ); Thu, 18 Jan 2007 01:32:34 -0500 Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:38379 "EHLO filer.fsl.cs.sunysb.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751980AbXARGcd (ORCPT ); Thu, 18 Jan 2007 01:32:33 -0500 Date: Thu, 18 Jan 2007 01:30:19 -0500 From: Josef Sipek To: Dave Kleikamp Cc: Jens Axboe , JFS Discussion , fsdevel , linux-kernel , Nick Piggin Subject: Re: [PATCH: 2.6.20-rc4-mm1] JFS: Avoid deadlock introduced by explicit I/O plugging Message-ID: <20070118063019.GA31164@filer.fsl.cs.sunysb.edu> References: <1169074549.10560.10.camel@kleikamp.austin.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1169074549.10560.10.camel@kleikamp.austin.ibm.com> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 969 Lines: 34 On Wed, Jan 17, 2007 at 04:55:49PM -0600, Dave Kleikamp wrote: ... > diff -Nurp linux-2.6.20-rc4-mm1/fs/jfs/jfs_lock.h linux/fs/jfs/jfs_lock.h > --- linux-2.6.20-rc4-mm1/fs/jfs/jfs_lock.h 2006-11-29 15:57:37.000000000 -0600 > +++ linux/fs/jfs/jfs_lock.h 2007-01-17 15:30:19.000000000 -0600 > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > > /* > * jfs_lock.h > @@ -42,6 +43,7 @@ do { \ > if (cond) \ > break; \ > unlock_cmd; \ > + blk_replug_current_nested(); \ > schedule(); \ > lock_cmd; \ > } \ Is {,un}lock_cmd a macro? ... Jeff. -- Keyboard not found! Press F1 to enter Setup - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/