Messages in this thread | | | Date | Thu, 9 Jan 2014 15:01:33 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the block tree with the btrfs tree |
| |
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 [unhandled content-type:application/pgp-signature] | |