block: replace bi_bdev with a gendisk pointer and partitions index

[mirror_ubuntu-hirsute-kernel.git] / drivers / nvdimm / nd.h

diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index e1b5715bd91ff40b0a00a88ad958ab320df91536..a87f793f2945ec4b46a283fa482f746b94996c15 100644 (file)
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -390,21 +390,22 @@ int nd_region_activate(struct nd_region *nd_region);
 void __nd_iostat_start(struct bio *bio, unsigned long *start);
 static inline bool nd_iostat_start(struct bio *bio, unsigned long *start)
 {
-       struct gendisk *disk = bio->bi_bdev->bd_disk;
+       struct gendisk *disk = bio->bi_disk;
 
        if (!blk_queue_io_stat(disk->queue))
                return false;
 
        *start = jiffies;
-       generic_start_io_acct(bio_data_dir(bio),
+       generic_start_io_acct(disk->queue, bio_data_dir(bio),
                              bio_sectors(bio), &disk->part0);
        return true;
 }
 static inline void nd_iostat_end(struct bio *bio, unsigned long start)
 {
-       struct gendisk *disk = bio->bi_bdev->bd_disk;
+       struct gendisk *disk = bio->bi_disk;
 
-       generic_end_io_acct(bio_data_dir(bio), &disk->part0, start);
+       generic_end_io_acct(disk->queue, bio_data_dir(bio), &disk->part0,
+                               start);
 }
 static inline bool is_bad_pmem(struct badblocks *bb, sector_t sector,
                unsigned int len)