@@ -223,11 +223,9 @@ static int write_metadata(struct log_writes_c *lc, void *entry,
goto error;
}
bio->bi_iter.bi_size = 0;
- bio->bi_iter.bi_sector = sector;
- bio_set_dev(bio, lc->logdev->bdev);
bio->bi_end_io = (sector == WRITE_LOG_SUPER_SECTOR) ?
log_end_super : log_end_io;
- bio->bi_private = lc;
+ bio_init_fields(bio, lc->logdev->bdev, sector, lc, NULL, 0, 0);
bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
page = alloc_page(GFP_KERNEL);
@@ -283,10 +281,8 @@ static int write_inline_data(struct log_writes_c *lc, void *entry,
}
bio->bi_iter.bi_size = 0;
- bio->bi_iter.bi_sector = sector;
- bio_set_dev(bio, lc->logdev->bdev);
- bio->bi_end_io = log_end_io;
- bio->bi_private = lc;
+ bio_init_fields(bio, lc->logdev->bdev, sector, lc, log_end_io,
+ 0, 0);
bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
for (i = 0; i < bio_pages; i++) {
@@ -370,10 +366,8 @@ static int log_one_block(struct log_writes_c *lc,
goto error;
}
bio->bi_iter.bi_size = 0;
- bio->bi_iter.bi_sector = sector;
- bio_set_dev(bio, lc->logdev->bdev);
- bio->bi_end_io = log_end_io;
- bio->bi_private = lc;
+ bio_init_fields(bio, lc->logdev->bdev, sector, lc, log_end_io,
+ 0, 0);
bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
for (i = 0; i < block->vec_cnt; i++) {
@@ -392,10 +386,7 @@ static int log_one_block(struct log_writes_c *lc,
goto error;
}
bio->bi_iter.bi_size = 0;
- bio->bi_iter.bi_sector = sector;
- bio_set_dev(bio, lc->logdev->bdev);
- bio->bi_end_io = log_end_io;
- bio->bi_private = lc;
+ bio_init_fields(bio, lc->logdev->bdev, sector, lc, log_end_io, 0, 0);
bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
ret = bio_add_page(bio, block->vecs[i].bv_page,
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> --- drivers/md/dm-log-writes.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)