[RFC PATCH 15/37] drdb: use bio_init_fields in receiver
From: Chaitanya Kulkarni <hidden>
Date: 2021-01-19 05:26:20
Also in:
dm-devel, linux-bcache, linux-block, linux-btrfs, linux-ext4, linux-fsdevel, linux-scsi, linux-xfs, lkml, target-devel
Subsystem:
block layer, drbd driver, the rest · Maintainers:
Jens Axboe, Philipp Reisner, Lars Ellenberg, Christoph Böhmwalder, Linus Torvalds
Signed-off-by: Chaitanya Kulkarni <redacted> --- drivers/block/drbd/drbd_receiver.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 09c86ef3f0fd..2715081a4603 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c@@ -1296,9 +1296,7 @@ static void submit_one_flush(struct drbd_device *device, struct issue_flush_cont octx->device = device; octx->ctx = ctx; - bio_set_dev(bio, device->ldev->backing_bdev); - bio->bi_private = octx; - bio->bi_end_io = one_flush_endio; + bio_init_fields(bio, device->ldev->backing_bdev, 0, octx, one_flush_endio, 0, 0); bio->bi_opf = REQ_OP_FLUSH | REQ_PREFLUSH; device->flush_jif = jiffies;
@@ -1693,12 +1691,9 @@ int drbd_submit_peer_request(struct drbd_device *device, goto fail; } /* > peer_req->i.sector, unless this is the first bio */ - bio->bi_iter.bi_sector = sector; - bio_set_dev(bio, device->ldev->backing_bdev); + bio_init_fields(bio, device->ldev->backing_bdev, sector, peer_req, + drbd_peer_request_endio, 0, 0); bio_set_op_attrs(bio, op, op_flags); - bio->bi_private = peer_req; - bio->bi_end_io = drbd_peer_request_endio; - bio->bi_next = bios; bios = bio; ++n_bios;
--
2.22.1