linux-next: build failure after merge of the bcon tree

[Stephen Rothwell]

Hi JÃrn,

After merging the bcon tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/block/blockconsole.c: In function 'sync_read':
drivers/block/blockconsole.c:184:5: error: 'struct bio' has no member named 'bi_idx'
  bio.bi_idx = 0;
     ^
drivers/block/blockconsole.c:185:5: error: 'struct bio' has no member named 'bi_size'
  bio.bi_size = SECTOR_SIZE;
     ^
drivers/block/blockconsole.c:187:5: error: 'struct bio' has no member named 'bi_sector'
  bio.bi_sector = ofs >> SECTOR_SHIFT;
     ^
drivers/block/blockconsole.c: In function 'bcon_erase_segment':
drivers/block/blockconsole.c:215:6: error: 'struct bio' has no member named 'bi_size'
   bio->bi_size = PAGE_SIZE;
      ^
drivers/block/blockconsole.c:218:6: error: 'struct bio' has no member named 'bi_idx'
   bio->bi_idx = 0;
      ^
drivers/block/blockconsole.c:219:6: error: 'struct bio' has no member named 'bi_sector'
   bio->bi_sector = (bc->write_bytes + i * PAGE_SIZE) >> 9;
      ^
drivers/block/blockconsole.c: In function 'bcon_writesector':
drivers/block/blockconsole.c:338:5: error: 'struct bio' has no member named 'bi_size'
  bio->bi_size = SECTOR_SIZE;
     ^
drivers/block/blockconsole.c:343:5: error: 'struct bio' has no member named 'bi_idx'
  bio->bi_idx = 0;
     ^
drivers/block/blockconsole.c:344:5: error: 'struct bio' has no member named 'bi_sector'
  bio->bi_sector = bc->write_bytes >> 9;
     ^

Caused by changes in the block tree.  Thierry Reding mentioned that you
didn't think that the bcon tree was linux-next material any more, so I
just dropped your tree.  If that is incorrect, please let me know and I
will reinstate it and fix this merge conflict.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature