mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
blk-mq-sched: unify request finished methods
No need to have two different callouts of bfq vs kyber. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
ea511e3c28
commit
7b9e936163
4 changed files with 11 additions and 17 deletions
|
|
@ -4290,7 +4290,7 @@ static void bfq_put_rq_priv_body(struct bfq_queue *bfqq)
|
|||
bfq_put_queue(bfqq);
|
||||
}
|
||||
|
||||
static void bfq_put_rq_private(struct request_queue *q, struct request *rq)
|
||||
static void bfq_finish_request(struct request *rq)
|
||||
{
|
||||
struct bfq_queue *bfqq = RQ_BFQQ(rq);
|
||||
struct bfq_data *bfqd = bfqq->bfqd;
|
||||
|
|
@ -4324,7 +4324,7 @@ static void bfq_put_rq_private(struct request_queue *q, struct request *rq)
|
|||
*/
|
||||
|
||||
if (!RB_EMPTY_NODE(&rq->rb_node))
|
||||
bfq_remove_request(q, rq);
|
||||
bfq_remove_request(rq->q, rq);
|
||||
bfq_put_rq_priv_body(bfqq);
|
||||
}
|
||||
|
||||
|
|
@ -4951,7 +4951,7 @@ static struct elv_fs_entry bfq_attrs[] = {
|
|||
static struct elevator_type iosched_bfq_mq = {
|
||||
.ops.mq = {
|
||||
.get_rq_priv = bfq_get_rq_private,
|
||||
.put_rq_priv = bfq_put_rq_private,
|
||||
.finish_request = bfq_finish_request,
|
||||
.exit_icq = bfq_exit_icq,
|
||||
.insert_requests = bfq_insert_requests,
|
||||
.dispatch_request = bfq_dispatch_request,
|
||||
|
|
|
|||
Loading…
Reference in a new issue