diff options
| author |  Jens Axboe <axboe@kernel.dk>
| 2017-06-30 21:55:08 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk>
| 2017-08-09 13:09:16 -0600 |
| commit | d62e26b3ffd28f16ddae85a1babd0303a1a6dfb6 (patch) | |
| tree | 622dd61c60712f31575b2cdde0811529b829ba8a /block/blk-merge.c | |
| parent | blk-mq-tag: check for NULL rq when iterating tags (diff) | |
| download | linux-d62e26b3ffd28f16ddae85a1babd0303a1a6dfb6.tar.gz linux-d62e26b3ffd28f16ddae85a1babd0303a1a6dfb6.tar.bz2 linux-d62e26b3ffd28f16ddae85a1babd0303a1a6dfb6.zip | |
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 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 99038830fb42..05f116bfb99d 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -633,8 +633,8 @@ static void blk_account_io_merge(struct request *req) cpu = part_stat_lock(); part = req->part; - part_round_stats(cpu, part); - part_dec_in_flight(part, rq_data_dir(req)); + part_round_stats(req->q, cpu, part); + part_dec_in_flight(req->q, part, rq_data_dir(req)); hd_struct_put(part); part_stat_unlock(); |