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

Stephen Rothwell
2013-11-26T02:30:25Z

[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]

Hi Jens,

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

fs/f2fs/data.c: In function 'submit_read_page':
fs/f2fs/data.c:457:10: error: 'struct bio' has no member named 'bi_sector'
io->bio->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
^

Caused by commit 4f024f3797c4 ("block: Abstract out bvec iterator") from
the block tree interacting with commit 32cd69ef0893 ("f2fs: add a new
function to support for merging contiguous read") from the f2fs tree.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 Nov 2013 13:19:30 +1100
Subject: [PATCH] f2fs: cope with bvec iterator abstraction

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/f2fs/data.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 728eedb1c0c6..8d31b83bfc89 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -454,7 +454,7 @@ alloc_new:
if (io->bio == NULL) {
bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
io->bio = f2fs_bio_alloc(bdev, bio_blocks);
- io->bio->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
+ io->bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
io->bio->bi_end_io = read_end_io;
}

--
1.8.4.3

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]