Re: [xfs-masters] linux-next: manual merge of the xfs tree with Linus' tree

[Jens Axboe <jaxboe@xxxxxxxxxxxx>]

On 2011-03-28 12:53, Christoph Hellwig wrote:
> 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.

Yes, in fact all of the blk_flush_plug() calls in XFS can just go away
now. I tried to keep them for clarity, but they are primarily there
since XFS was the first conversion/testing I did back when it was hacked
up.

-- 
Jens Axboe