block: consolidate struct request timestamp fields

[mirror_ubuntu-eoan-kernel.git] / block / blk-mq.c

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 39b4e9834d82526b37dba8e7654ab1b9abca8223..4e9d83594cca40577b624a8cd304ff41977e5d4f 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -309,7 +309,7 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data,
        RB_CLEAR_NODE(&rq->rb_node);
        rq->rq_disk = NULL;
        rq->part = NULL;
-       rq->start_time = jiffies;
+       rq->start_time_ns = ktime_get_ns();
        rq->io_start_time_ns = 0;
        rq->nr_phys_segments = 0;
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
@@ -329,8 +329,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data,
 
 #ifdef CONFIG_BLK_CGROUP
        rq->rl = NULL;
-       set_start_time_ns(rq);
-       rq->cgroup_io_start_time_ns = 0;
 #endif
 
        data->ctx->rq_dispatched[op_is_sync(op)]++;
@@ -506,12 +504,14 @@ EXPORT_SYMBOL_GPL(blk_mq_free_request);
 
 inline void __blk_mq_end_request(struct request *rq, blk_status_t error)
 {
+       u64 now = ktime_get_ns();
+
        if (rq->rq_flags & RQF_STATS) {
                blk_mq_poll_stats_start(rq->q);
-               blk_stat_add(rq);
+               blk_stat_add(rq, now);
        }
 
-       blk_account_io_done(rq);
+       blk_account_io_done(rq, now);
 
        if (rq->end_io) {
                wbt_done(rq->q->rq_wb, rq);