From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752573AbbIBCQw (ORCPT ); Tue, 1 Sep 2015 22:16:52 -0400 Received: from ozlabs.org ([103.22.144.67]:48643 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751169AbbIBCQv (ORCPT ); Tue, 1 Sep 2015 22:16:51 -0400 Date: Wed, 2 Sep 2015 12:16:49 +1000 From: Stephen Rothwell To: Jens Axboe , Ben Myers , David Chinner , xfs@oss.sgi.com Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , David Jeffery Subject: linux-next: manual merge of the block tree with the xfs tree Message-ID: <20150902121649.7a686b6c@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jens, Today's linux-next merge of the block tree got a conflict in: fs/xfs/xfs_aops.c between commit: c9eb256eda44 ("xfs: return errors from partial I/O failures to files") from the xfs tree and commit: 4246a0b63bd8 ("block: add a bi_error field to struct bio") from the block tree. I fixed it up (I think - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc fs/xfs/xfs_aops.c index c8637073ef25,c77499bcbd7a..000000000000 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@@ -354,8 -355,7 +353,8 @@@ xfs_end_bio { xfs_ioend_t *ioend = bio->bi_private; - if (!ioend->io_error && !test_bit(BIO_UPTODATE, &bio->bi_flags)) - ioend->io_error = error; - ioend->io_error = bio->bi_error; ++ if (!ioend->io_error) ++ ioend->io_error = bio->bi_error; /* Toss bio and pass work off to an xfsdatad thread */ bio->bi_private = NULL;