[RFC PATCH 17/37] pktcdvd: use bio_init_fields
From: Chaitanya Kulkarni <hidden>
Date: 2021-01-19 07:41:21
Also in:
dm-devel, linux-bcache, linux-block, linux-btrfs, linux-ext4, linux-fsdevel, linux-scsi, linux-xfs, lkml, target-devel
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Signed-off-by: Chaitanya Kulkarni <redacted> --- drivers/block/pktcdvd.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index b8bb8ec7538d..47eb4e0bd4c3 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c@@ -1028,10 +1028,8 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt) bio = pkt->r_bios[f]; bio_reset(bio); - bio->bi_iter.bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9); - bio_set_dev(bio, pd->bdev); - bio->bi_end_io = pkt_end_io_read; - bio->bi_private = pkt; + bio_init_fields(bio, pd->bdev, pkt->sector + f * (CD_FRAMESIZE >> 9), pkt, + pkt_end_io_read, 0, 0); p = (f * CD_FRAMESIZE) / PAGE_SIZE; offset = (f * CD_FRAMESIZE) % PAGE_SIZE;
@@ -1208,10 +1206,8 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) int f; bio_reset(pkt->w_bio); - pkt->w_bio->bi_iter.bi_sector = pkt->sector; - bio_set_dev(pkt->w_bio, pd->bdev); - pkt->w_bio->bi_end_io = pkt_end_io_packet_write; - pkt->w_bio->bi_private = pkt; + bio_init_fields(pkt->w_bio, pd->bdev, pkt->sector, pkt, + pkt_end_io_packet_write, 0, 0); /* XXX: locking? */ for (f = 0; f < pkt->frames; f++) {
--
2.22.1