From: Jens Axboe <axboe@kernel•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>, David Sterba <dsterba@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>
Subject: Re: linux-next: manual merge of the block tree with the btrfs-kdave tree
Date: Wed, 16 Nov 2016 19:49:29 -0700 [thread overview]
Message-ID: <5d5a631b-e18e-aa2b-67bb-e2df6d8bef15@kernel.dk> (raw)
In-Reply-To: <20161117130134.682bb6b4@canb.auug.org.au>
On 11/16/2016 07:01 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got conflicts in:
>
> fs/btrfs/extent_io.c
> fs/btrfs/inode.c
>
> between commit:
>
> 01a1400f8545 ("btrfs: only check bio size to see if a repair bio should have the failfast flag")
>
> from the btrfs-kdave tree and commit:
>
> 70fd76140a6c ("block,fs: use REQ_* flags directly")
>
> from the block 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.
>
I don't have the full context here, but this:
diff --cc fs/btrfs/extent_io.c
index 5694d60adad9,1e67723c27a1..000000000000
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -2403,10 -2403,8 +2403,8 @@@ static int bio_readpage_error(struct bi
return -EIO;
}
- if (failed_bio->bi_vcnt > 1)
+ if (failed_bio->bi_iter.bi_size > BTRFS_I(inode)->root->sectorsize)
- read_mode = READ_SYNC | REQ_FAILFAST_DEV;
- else
- read_mode = READ_SYNC;
+ read_mode |= REQ_FAILFAST_DEV;
phy_offset >>= inode->i_sb->s_blocksize_bits;
bio = btrfs_create_repair_bio(inode, failed_bio, failrec, page,
doesn't look correct, if bio_readpage_error() is called from the
->bi_end_io() handler. bi_size is generally zeroed at that time.
--
Jens Axboe
next prev parent reply other threads:[~2016-11-17 2:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-17 2:01 linux-next: manual merge of the block tree with the btrfs-kdave tree Stephen Rothwell
2016-11-17 2:49 ` Jens Axboe [this message]
2016-11-17 13:23 ` Christoph Hellwig
2016-11-18 17:47 ` David Sterba
-- strict thread matches above, loose matches on Subject: below --
2019-02-18 1:07 Stephen Rothwell
2017-06-21 3:13 Stephen Rothwell
2017-06-20 1:37 Stephen Rothwell
2017-06-13 3:50 Stephen Rothwell
2017-06-13 3:34 Stephen Rothwell
2017-06-13 3:27 Stephen Rothwell
2017-06-13 3:15 Stephen Rothwell
2016-07-08 4:03 Stephen Rothwell
2016-07-08 4:00 Stephen Rothwell
2016-07-08 3:49 Stephen Rothwell
2016-07-08 3:31 Stephen Rothwell
2016-07-08 3:27 Stephen Rothwell
2016-07-08 3:26 Stephen Rothwell
2016-06-24 2:34 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d5a631b-e18e-aa2b-67bb-e2df6d8bef15@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=dsterba@suse$(echo .)cz \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox