Messages in this thread | | | Date | Fri, 1 Nov 2013 14:29:18 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the block tree with the f2fs tree |
| |
Hi Jens,
Today's linux-next merge of the block tree got a conflict in fs/f2fs/segment.c between commit cc7b1bb17367 ("f2fs: avoid allocating failure in bio_alloc") from the f2fs tree and commit ed2d2f9a8265 ("block: Abstract out bvec iterator") from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/f2fs/segment.c index 3d4d5fc19e6f,9d77ce168676..000000000000 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@@ -675,9 -676,8 +675,9 @@@ retry goto retry; } - sbi->bio[type] = f2fs_bio_alloc(bdev, max_hw_blocks(sbi)); + bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); + sbi->bio[type] = f2fs_bio_alloc(bdev, bio_blocks); - sbi->bio[type]->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr); + sbi->bio[type]->bi_iter.bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr); sbi->bio[type]->bi_private = priv; /* * The end_io will be assigned at the sumbission phase. [unhandled content-type:application/pgp-signature] | |