diff options
author | Omar Sandoval <osandov@fb.com> | 2018-05-09 05:08:50 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-05-09 10:33:05 -0400 |
commit | 544ccc8dc904db55d4576c27a1eb66a888ffacea (patch) | |
tree | 5fa92e3cf1a5d33eddc61dfd65d088dd5cdb6f84 /block/kyber-iosched.c | |
parent | 5238dcf4136fd7287be8e7d38752645bfa5782ec (diff) |
block: get rid of struct blk_issue_stat
struct blk_issue_stat squashes three things into one u64:
- The time the driver started working on a request
- The original size of the request (for the io.low controller)
- Flags for writeback throttling
It turns out that on x86_64, we have a 4 byte hole in struct request
which we can fill with the non-timestamp fields from blk_issue_stat,
simplifying things quite a bit.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index 0d6d25e32e1f..564967fafe5f 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c | |||
@@ -485,11 +485,11 @@ static void kyber_completed_request(struct request *rq) | |||
485 | if (blk_stat_is_active(kqd->cb)) | 485 | if (blk_stat_is_active(kqd->cb)) |
486 | return; | 486 | return; |
487 | 487 | ||
488 | now = __blk_stat_time(ktime_to_ns(ktime_get())); | 488 | now = ktime_get_ns(); |
489 | if (now < blk_stat_time(&rq->issue_stat)) | 489 | if (now < rq->io_start_time_ns) |
490 | return; | 490 | return; |
491 | 491 | ||
492 | latency = now - blk_stat_time(&rq->issue_stat); | 492 | latency = now - rq->io_start_time_ns; |
493 | 493 | ||
494 | if (latency > target) | 494 | if (latency > target) |
495 | blk_stat_activate_msecs(kqd->cb, 10); | 495 | blk_stat_activate_msecs(kqd->cb, 10); |