block: replace bi_bdev with a gendisk pointer and partitions index

[mirror_ubuntu-hirsute-kernel.git] / drivers / nvme / target / io-cmd.c

diff --git a/drivers/nvme/target/io-cmd.c b/drivers/nvme/target/io-cmd.c
index 3b4d47a6abdb8337419f3e8e054c9a00e1147091..0d4c23dc453247eb79c795895f0b829912ff18fd 100644 (file)
--- a/drivers/nvme/target/io-cmd.c
+++ b/drivers/nvme/target/io-cmd.c
@@ -68,7 +68,7 @@ static void nvmet_execute_rw(struct nvmet_req *req)
 
        nvmet_inline_bio_init(req);
        bio = &req->inline_bio;
-       bio->bi_bdev = req->ns->bdev;
+       bio_set_dev(bio, req->ns->bdev);
        bio->bi_iter.bi_sector = sector;
        bio->bi_private = req;
        bio->bi_end_io = nvmet_bio_done;
@@ -80,7 +80,7 @@ static void nvmet_execute_rw(struct nvmet_req *req)
                        struct bio *prev = bio;
 
                        bio = bio_alloc(GFP_KERNEL, min(sg_cnt, BIO_MAX_PAGES));
-                       bio->bi_bdev = req->ns->bdev;
+                       bio_set_dev(bio, req->ns->bdev);
                        bio->bi_iter.bi_sector = sector;
                        bio_set_op_attrs(bio, op, op_flags);
 
@@ -104,7 +104,7 @@ static void nvmet_execute_flush(struct nvmet_req *req)
        nvmet_inline_bio_init(req);
        bio = &req->inline_bio;
 
-       bio->bi_bdev = req->ns->bdev;
+       bio_set_dev(bio, req->ns->bdev);
        bio->bi_private = req;
        bio->bi_end_io = nvmet_bio_done;
        bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;