diff options
| author | Jens Axboe | 2017-07-01 05:55:08 +0200 |
|---|---|---|
| committer | Jens Axboe | 2017-08-09 21:09:16 +0200 |
| commit | d62e26b3ffd28f16ddae85a1babd0303a1a6dfb6 (patch) | |
| tree | 622dd61c60712f31575b2cdde0811529b829ba8a /drivers/block/zram | |
| parent | blk-mq-tag: check for NULL rq when iterating tags (diff) | |
| download | kernel-qcow2-linux-d62e26b3ffd28f16ddae85a1babd0303a1a6dfb6.tar.gz kernel-qcow2-linux-d62e26b3ffd28f16ddae85a1babd0303a1a6dfb6.tar.xz kernel-qcow2-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 'drivers/block/zram')
| -rw-r--r-- | drivers/block/zram/zram_drv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 856d5dc02451..1c3383b4a0cf 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -813,9 +813,10 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index, { unsigned long start_time = jiffies; int rw_acct = is_write ? REQ_OP_WRITE : REQ_OP_READ; + struct request_queue *q = zram->disk->queue; int ret; - generic_start_io_acct(rw_acct, bvec->bv_len >> SECTOR_SHIFT, + generic_start_io_acct(q, rw_acct, bvec->bv_len >> SECTOR_SHIFT, &zram->disk->part0); if (!is_write) { @@ -827,7 +828,7 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index, ret = zram_bvec_write(zram, bvec, index, offset); } - generic_end_io_acct(rw_acct, &zram->disk->part0, start_time); + generic_end_io_acct(q, rw_acct, &zram->disk->part0, start_time); if (unlikely(ret)) { if (!is_write) |