diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-16 18:15:21 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-18 10:08:55 -0600 |
| commit | 7b9e93616399638521aafd1f01dfcf474c736393 (patch) | |
| tree | b135a4bc68b8c8a8325ae8a0634686f0ddb7f0f8 /block/kyber-iosched.c | |
| parent | ea511e3c28c892f689173c91662437c4ddb2ab38 (diff) | |
| download | linux-7b9e93616399638521aafd1f01dfcf474c736393.tar.gz linux-7b9e93616399638521aafd1f01dfcf474c736393.tar.bz2 linux-7b9e93616399638521aafd1f01dfcf474c736393.zip | |
blk-mq-sched: unify request finished methods
No need to have two different callouts of bfq vs kyber.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/kyber-iosched.c')
| -rw-r--r-- | block/kyber-iosched.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index b9faabc75fdb..2557b399f0a8 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c @@ -446,13 +446,11 @@ static struct request *kyber_get_request(struct request_queue *q, return rq; } -static void kyber_put_request(struct request *rq) +static void kyber_finish_request(struct request *rq) { - struct request_queue *q = rq->q; - struct kyber_queue_data *kqd = q->elevator->elevator_data; + struct kyber_queue_data *kqd = rq->q->elevator->elevator_data; rq_clear_domain_token(kqd, rq); - blk_mq_finish_request(rq); } static void kyber_completed_request(struct request *rq) @@ -816,7 +814,7 @@ static struct elevator_type kyber_sched = { .init_hctx = kyber_init_hctx, .exit_hctx = kyber_exit_hctx, .get_request = kyber_get_request, - .put_request = kyber_put_request, + .finish_request = kyber_finish_request, .completed_request = kyber_completed_request, .dispatch_request = kyber_dispatch_request, .has_work = kyber_has_work, |