diff options
author | Jens Axboe <axboe@kernel.dk> | 2017-06-30 23:55:08 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-08-09 15:09:16 -0400 |
commit | d62e26b3ffd28f16ddae85a1babd0303a1a6dfb6 (patch) | |
tree | 622dd61c60712f31575b2cdde0811529b829ba8a /drivers/nvdimm/nd.h | |
parent | 7f5562d5ecc44c757599b201df928ba52fa05047 (diff) |
block: pass in queue to inflight accounting
No functional change in this patch, just in preparation for
basing the inflight mechanism on the queue in question.
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvdimm/nd.h')
-rw-r--r-- | drivers/nvdimm/nd.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index e1b5715bd91f..73062da3177f 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h | |||
@@ -396,7 +396,7 @@ static inline bool nd_iostat_start(struct bio *bio, unsigned long *start) | |||
396 | return false; | 396 | return false; |
397 | 397 | ||
398 | *start = jiffies; | 398 | *start = jiffies; |
399 | generic_start_io_acct(bio_data_dir(bio), | 399 | generic_start_io_acct(disk->queue, bio_data_dir(bio), |
400 | bio_sectors(bio), &disk->part0); | 400 | bio_sectors(bio), &disk->part0); |
401 | return true; | 401 | return true; |
402 | } | 402 | } |
@@ -404,7 +404,8 @@ static inline void nd_iostat_end(struct bio *bio, unsigned long start) | |||
404 | { | 404 | { |
405 | struct gendisk *disk = bio->bi_bdev->bd_disk; | 405 | struct gendisk *disk = bio->bi_bdev->bd_disk; |
406 | 406 | ||
407 | generic_end_io_acct(bio_data_dir(bio), &disk->part0, start); | 407 | generic_end_io_acct(disk->queue, bio_data_dir(bio), &disk->part0, |
408 | start); | ||
408 | } | 409 | } |
409 | static inline bool is_bad_pmem(struct badblocks *bb, sector_t sector, | 410 | static inline bool is_bad_pmem(struct badblocks *bb, sector_t sector, |
410 | unsigned int len) | 411 | unsigned int len) |