diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-11-17 07:14:01 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-11-29 06:34:51 -0700 |
| commit | 450b7879e34517c3ebc3a35a53806fe40e60fac2 (patch) | |
| tree | 2437681fff3078cd71bc3f45f854ca785411fe76 /block/blk-core.c | |
| parent | f2b8f3ce989d8066f2dedaad223b3e73c4485223 (diff) | |
block: move blk_account_io_{start,done} to blk-mq.c
These are only used for request based I/O, so move them where they are
used.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20211117061404.331732-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 65891f058f3d..29c4db03742b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1064,8 +1064,7 @@ int iocb_bio_iopoll(struct kiocb *kiocb, struct io_comp_batch *iob, } EXPORT_SYMBOL_GPL(iocb_bio_iopoll); -static void update_io_ticks(struct block_device *part, unsigned long now, - bool end) +void update_io_ticks(struct block_device *part, unsigned long now, bool end) { unsigned long stamp; again: @@ -1080,30 +1079,6 @@ again: } } -void __blk_account_io_done(struct request *req, u64 now) -{ - const int sgrp = op_stat_group(req_op(req)); - - part_stat_lock(); - update_io_ticks(req->part, jiffies, true); - part_stat_inc(req->part, ios[sgrp]); - part_stat_add(req->part, nsecs[sgrp], now - req->start_time_ns); - part_stat_unlock(); -} - -void __blk_account_io_start(struct request *rq) -{ - /* passthrough requests can hold bios that do not have ->bi_bdev set */ - if (rq->bio && rq->bio->bi_bdev) - rq->part = rq->bio->bi_bdev; - else - rq->part = rq->rq_disk->part0; - - part_stat_lock(); - update_io_ticks(rq->part, jiffies, false); - part_stat_unlock(); -} - static unsigned long __part_start_io_acct(struct block_device *part, unsigned int sectors, unsigned int op) { |