From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, David Sterba <dsterba@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the block tree with the btrfs-kdave tree
Date: Thu, 17 Nov 2016 13:01:34 +1100 [thread overview]
Message-ID: <20161117130134.682bb6b4@canb.auug.org.au> (raw)
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.
--
Cheers,
Stephen Rothwell
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,
diff --cc fs/btrfs/inode.c
index 7e8603c74f43,a4c879671b9d..000000000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -7924,10 -7933,10 +7924,8 @@@ static int dio_read_error(struct inode
return -EIO;
}
- if ((failed_bio->bi_vcnt > 1)
- || (failed_bio->bi_io_vec->bv_len
- > BTRFS_I(inode)->root->sectorsize))
+ 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;
isector = start - btrfs_io_bio(failed_bio)->logical;
isector >>= inode->i_sb->s_blocksize_bits;
next reply other threads:[~2016-11-17 2:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-17 2:01 Stephen Rothwell [this message]
2016-11-17 2:49 ` linux-next: manual merge of the block tree with the btrfs-kdave tree Jens Axboe
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=20161117130134.682bb6b4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=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 \
/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