From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757134AbcLNXZk (ORCPT ); Wed, 14 Dec 2016 18:25:40 -0500 Received: from ozlabs.org ([103.22.144.67]:53801 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753935AbcLNXZi (ORCPT ); Wed, 14 Dec 2016 18:25:38 -0500 Date: Thu, 15 Dec 2016 10:25:35 +1100 From: Stephen Rothwell To: David Sterba Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Jens Axboe , Jeff Mahoney Subject: linux-next: manual merge of the btrfs-kdave tree with Linus' tree Message-ID: <20161215102535.5e8db7e0@canb.auug.org.au> 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 David, Today's linux-next merge of the btrfs-kdave tree got a conflict in: fs/btrfs/inode.c between commit: 70fd76140a6c ("block,fs: use REQ_* flags directly") from Linus' tree and commit: da17066c4047 ("btrfs: pull node/sector/stripe sizes out of root and into fs_info") from the btrfs-kdave tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc fs/btrfs/inode.c index a4c879671b9d,b2a577cf001f..000000000000 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@@ -7935,8 -7941,10 +7941,8 @@@ static int dio_read_error(struct inode if ((failed_bio->bi_vcnt > 1) || (failed_bio->bi_io_vec->bv_len - > BTRFS_I(inode)->root->sectorsize)) + > btrfs_inode_sectorsize(inode))) - read_mode = READ_SYNC | REQ_FAILFAST_DEV; - else - read_mode = READ_SYNC; + read_mode |= REQ_FAILFAST_DEV; isector = start - btrfs_io_bio(failed_bio)->logical; isector >>= inode->i_sb->s_blocksize_bits;