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>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index 019b3df9f1c6..72eb97176403 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -607,7 +607,8 @@ static void request_endio(struct bio *bio)
 static void bio_complete(struct search *s)
 {
         if (s->orig_bio) {
-                generic_end_io_acct(bio_data_dir(s->orig_bio),
+                struct request_queue *q = bdev_get_queue(s->orig_bio->bi_bdev);
+                generic_end_io_acct(q, bio_data_dir(s->orig_bio),
                                     &s->d->disk->part0, s->start_time);
 
                 trace_bcache_request_end(s->d, s->orig_bio);
@@ -959,7 +960,7 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q,
         struct cached_dev *dc = container_of(d, struct cached_dev, disk);
         int rw = bio_data_dir(bio);
 
-        generic_start_io_acct(rw, bio_sectors(bio), &d->disk->part0);
+        generic_start_io_acct(q, rw, bio_sectors(bio), &d->disk->part0);
 
         bio->bi_bdev = dc->bdev;
         bio->bi_iter.bi_sector += dc->sb.data_offset;
@@ -1074,7 +1075,7 @@ static blk_qc_t flash_dev_make_request(struct request_queue *q,
         struct bcache_device *d = bio->bi_bdev->bd_disk->private_data;
         int rw = bio_data_dir(bio);
 
-        generic_start_io_acct(rw, bio_sectors(bio), &d->disk->part0);
+        generic_start_io_acct(q, rw, bio_sectors(bio), &d->disk->part0);
 
         s = search_alloc(bio, d);
         cl = &s->cl;