linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

Hi Nicholas,

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

drivers/target/target_core_iblock.c: In function 'iblock_alloc_bip':
drivers/target/target_core_iblock.c:646:5: error: 'struct bio_integrity_payload' has no member named 'bip_size'
  bip->bip_size = (cmd->data_length / dev->dev_attrib.block_size) *
     ^
drivers/target/target_core_iblock.c:648:5: error: 'struct bio_integrity_payload' has no member named 'bip_sector'
  bip->bip_sector = bio->bi_sector;
     ^
drivers/target/target_core_iblock.c:648:23: error: 'struct bio' has no member named 'bi_sector'
  bip->bip_sector = bio->bi_sector;
                       ^
In file included from include/linux/printk.h:243:0,
                 from include/linux/kernel.h:13,
                 from include/linux/cache.h:4,
                 from include/linux/time.h:4,
                 from include/linux/ktime.h:24,
                 from include/linux/timer.h:5,
                 from drivers/target/target_core_iblock.c:29:
drivers/target/target_core_iblock.c:650:52: error: 'struct bio_integrity_payload' has no member named 'bip_size'
  pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_size,
                                                    ^
drivers/target/target_core_iblock.c:651:27: error: 'struct bio_integrity_payload' has no member named 'bip_sector'
    (unsigned long long)bip->bip_sector);
                           ^

Caused by commit ecebbf6ccbca ("target/iblock: Add blk_integrity + BIP
passthrough support") interacting with commits 4f024f3797c4 ("block:
Abstract out bvec iterator") and d57a5f7c6605 ("bio-integrity: Convert to
bvec_iter") from the block tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 20 Jan 2014 16:21:31 +1100
Subject: [PATCH] tagtet/iblock: merge for for bvec_iter changes

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/target/target_core_iblock.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index b7c64ef78338..554d4f75a75a 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -643,12 +643,12 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio)
 		return -ENOMEM;
 	}
 
-	bip->bip_size = (cmd->data_length / dev->dev_attrib.block_size) *
+	bip->bip_iter.bi_size = (cmd->data_length / dev->dev_attrib.block_size) *
 			 dev->prot_length;
-	bip->bip_sector = bio->bi_sector;
+	bip->bip_iter.bi_sector = bio->bi_iter.bi_sector;
 
-	pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_size,
-		 (unsigned long long)bip->bip_sector);
+	pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_iter.bi_size,
+		 (unsigned long long)bip->bip_iter.bi_sector);
 
 	for_each_sg(cmd->t_prot_sg, sg, cmd->t_prot_nents, i) {
 
-- 
1.8.5.3

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature