Messages in this thread | | | Date | Wed, 15 Jan 2014 15:07:43 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the md tree with the block tree |
| |
Hi Neil,
Today's linux-next merge of the md tree got a conflict in drivers/md/raid10.c between commit 4f024f3797c4 ("block: Abstract out bvec iterator") from the block tree and commit b50c259e25d9 ("md/raid10: fix two bugs in handling of known-bad-blocks") from the md 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 drivers/md/raid10.c index 6d43d88657aa,8d39d63281b9..000000000000 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@@ -1256,8 -1319,8 +1256,8 @@@ read_again /* Could not read all from this device, so we will * need another r10_bio. */ - sectors_handled = (r10_bio->sectors + max_sectors + sectors_handled = (r10_bio->sector + max_sectors - - bio->bi_sector); + - bio->bi_iter.bi_sector); r10_bio->sectors = max_sectors; spin_lock_irq(&conf->device_lock); if (bio->bi_phys_segments == 0) [unhandled content-type:application/pgp-signature] | |