Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx> --- drivers/target/target_core_iblock.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 8ed93fd205c7..ec65a9494bee 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c @@ -324,10 +324,7 @@ iblock_get_bio(struct se_cmd *cmd, sector_t lba, u32 sg_num, int op, return NULL; } - bio_set_dev(bio, ib_dev->ibd_bd); - bio->bi_private = cmd; - bio->bi_end_io = &iblock_bio_done; - bio->bi_iter.bi_sector = lba; + bio_init_fields(bio, ib_dev->ibd_bd, lba, cmd, &iblock_bio_done, 0, 0); bio_set_op_attrs(bio, op, op_flags); return bio; @@ -380,11 +377,9 @@ iblock_execute_sync_cache(struct se_cmd *cmd) target_complete_cmd(cmd, SAM_STAT_GOOD); bio = bio_alloc(GFP_KERNEL, 0); - bio->bi_end_io = iblock_end_io_flush; - bio_set_dev(bio, ib_dev->ibd_bd); + bio_init_fields(bio, ib_dev->ibd_bd, 0, immed ? NULL : cmd, + iblock_end_io_flush, 0, 0); bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH; - if (!immed) - bio->bi_private = cmd; submit_bio(bio); return 0; } -- 2.22.1
