Subject: Re: linux-next: build failure after merge of the block tree

From: Christoph Hellwig <[email-masked]>
Date: Tue, 3 Aug 2010 10:26:55 +0200

On Tue, Aug 03, 2010 at 01:12:02PM +1000, Stephen Rothwell wrote:
> I applied the following merge fix patch (Christoph, I assume that this
> should be directly applicable to the ceph tree, right?):

Yes, it looks good.

> -		if (!blk_fs_request(rq) && !blk_barrier_rq(rq)) {
> +		if ((rq->cmd_type != REQ_TYPE_FS) &&
> +		    !(rq->cmd_flags & REQ_HARDBARRIER)) {
>  			__blk_end_request_all(rq, 0);
>  			goto next;

Although these days barriers are REQ_TYPE_FS anyway, so the second check
is superflous.