diff options
| author |   Omar Sandoval <osandov@fb.com> | 2018-09-27 15:55:51 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-09-27 17:34:52 -0600 |
| commit | ed88660a5372faa67c168c3db5201e33e488c9fd (patch) | |
| tree | 8019473ab93c4b987cf07da9cad88d7cf60a69ed /block/kyber-iosched.c | |
| parent | blk-mq: Enable support for runtime power management (diff) | |
| download | linux-dev-ed88660a5372faa67c168c3db5201e33e488c9fd.tar.xz linux-dev-ed88660a5372faa67c168c3db5201e33e488c9fd.zip | |
block: move call of scheduler's ->completed_request() hook
Commit 4bc6339a583c ("block: move blk_stat_add() to
__blk_mq_end_request()") consolidated some calls using ktime_get() so
we'd only need to call it once. Kyber's ->completed_request() hook also
calls ktime_get(), so let's move it to the same place, too.
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/kyber-iosched.c')
| -rw-r--r-- | block/kyber-iosched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index a1660bafc912..95d062c07c61 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c @@ -558,12 +558,12 @@ static void kyber_finish_request(struct request *rq) rq_clear_domain_token(kqd, rq); } -static void kyber_completed_request(struct request *rq) +static void kyber_completed_request(struct request *rq, u64 now) { struct request_queue *q = rq->q; struct kyber_queue_data *kqd = q->elevator->elevator_data; unsigned int sched_domain; - u64 now, latency, target; + u64 latency, target; /* * Check if this request met our latency goal. If not, quickly gather @@ -585,7 +585,6 @@ static void kyber_completed_request(struct request *rq) if (blk_stat_is_active(kqd->cb)) return; - now = ktime_get_ns(); if (now < rq->io_start_time_ns) return; |