From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: Re: [xfs-masters] linux-next: manual merge of the xfs tree with Linus' tree Date: Mon, 28 Mar 2011 12:53:48 +0200 Message-ID: <20110328105348.GA27458@lst.de> References: <20110328122148.1b48a742.sfr@canb.auug.org.au> <20110328104753.GA27327@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from verein.lst.de ([213.95.11.211]:54195 "EHLO newverein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753210Ab1C1Kxt (ORCPT ); Mon, 28 Mar 2011 06:53:49 -0400 Content-Disposition: inline In-Reply-To: <20110328104753.GA27327@lst.de> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: David Chinner , xfs-masters@oss.sgi.com, Jens Axboe , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On Mon, Mar 28, 2011 at 12:47:53PM +0200, Christoph Hellwig wrote: > What XFS does is to replace blk_run_address_space, which was a wrapper > around blk_run_backing_dev with a direct call to blk_run_backing_dev, > as there change means we don't have the address_space around anymore. > > Jens' tree removes both these functions, and introduces blk_flush_plug > as a sort-of replacement. Sticking to the variant from Jens' tree / mainline > with blk_flush_plug is the correct thing here for this case. > > Where there more conflicts than just this? Actually I think we can remove some calls alltogether: the on-stack plugging already flushes the plug queue when context switching, which we'll always do in xfs_buf_wait_unpin, and if we get the lock without blocking in xfs_buf_lock we don't need to unplug either. Anyway, that's something to take care off in the XFS tree once it's merged after the next pull for Linus, no need to keep a fixup that complicated in linux-next.