From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Chris Mason <clm@fb•com>,
Josef Bacik <jbacik@fb•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kent Overstreet <kmo@daterainc•com>,
Valentina Giusti <valentina.giusti@microon•de>
Subject: linux-next: manual merge of the block tree with the btrfs tree
Date: Thu, 9 Jan 2014 15:01:33 +1100 [thread overview]
Message-ID: <20140109150133.cfaeb84aeea153c52bcb9828@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/btrfs/extent_io.c between commit 1c94f854cbb6 ("btrfs: remove unused
variables from extent_io.c") from the btrfs tree and commit 2c30c71bd653
("block: Convert various code to bio_for_each_segment()") from the block
tree.
I fixed it up (thanks Chris for the heads up and resolution - see below)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/btrfs/extent_io.c
index fbe501d3bd01,bcb6f1b780d6..000000000000
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -2375,12 -2332,15 +2375,13 @@@ int end_extent_writepage(struct page *p
*/
static void end_bio_extent_writepage(struct bio *bio, int err)
{
- struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
+ struct bio_vec *bvec;
- struct extent_io_tree *tree;
u64 start;
u64 end;
+ int i;
- do {
+ bio_for_each_segment_all(bvec, bio, i) {
struct page *page = bvec->bv_page;
- tree = &BTRFS_I(page->mapping->host)->io_tree;
/* We always issue full-page reads, but if some block
* in a page fails to read, blk_update_request() will
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-01-09 4:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-09 4:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-24 4:15 linux-next: manual merge of the block tree with the btrfs tree Stephen Rothwell
2015-08-24 4:15 Stephen Rothwell
2015-08-24 4:16 Stephen Rothwell
2015-08-24 4:16 Stephen Rothwell
2016-06-14 2:44 Stephen Rothwell
2020-07-09 2:58 Stephen Rothwell
2020-12-07 2:44 Stephen Rothwell
2021-02-02 2:45 Stephen Rothwell
2021-02-14 22:17 ` Stephen Rothwell
2022-07-15 3:25 Stephen Rothwell
2023-12-21 2:45 Stephen Rothwell
2023-12-21 5:23 ` Christoph Hellwig
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=20140109150133.cfaeb84aeea153c52bcb9828@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=clm@fb$(echo .)com \
--cc=jbacik@fb$(echo .)com \
--cc=kmo@daterainc$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=valentina.giusti@microon$(echo .)de \
/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