Linux 6.9-rc1

[linux-2.6-microblaze.git] / block / kyber-iosched.c

diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
index b05357b..4155594 100644 (file)
--- a/block/kyber-iosched.c
+++ b/block/kyber-iosched.c
@@ -8,7 +8,6 @@
 
 #include <linux/kernel.h>
 #include <linux/blkdev.h>
-#include <linux/blk-mq.h>
 #include <linux/module.h>
 #include <linux/sbitmap.h>
 
@@ -19,7 +18,6 @@
 #include "blk-mq.h"
 #include "blk-mq-debugfs.h"
 #include "blk-mq-sched.h"
-#include "blk-mq-tag.h"
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/kyber.h>
@@ -434,7 +432,7 @@ static void kyber_exit_sched(struct elevator_queue *e)
        struct kyber_queue_data *kqd = e->elevator_data;
        int i;
 
-       del_timer_sync(&kqd->timer);
+       timer_shutdown_sync(&kqd->timer);
        blk_stat_disable_accounting(kqd->q);
 
        for (i = 0; i < KYBER_NUM_DOMAINS; i++)
@@ -590,7 +588,8 @@ static void kyber_prepare_request(struct request *rq)
 }
 
 static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx,
-                                 struct list_head *rq_list, bool at_head)
+                                 struct list_head *rq_list,
+                                 blk_insert_t flags)
 {
        struct kyber_hctx_data *khd = hctx->sched_data;
        struct request *rq, *next;
@@ -602,7 +601,7 @@ static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx,
 
                spin_lock(&kcq->lock);
                trace_block_rq_insert(rq);
-               if (at_head)
+               if (flags & BLK_MQ_INSERT_AT_HEAD)
                        list_move(&rq->queuelist, head);
                else
                        list_move_tail(&rq->queuelist, head);