From a4d33f6631ddf578de702c3188180a6a8cb147d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nahuel=20G=C3=B3mez?= Date: Thu, 24 Oct 2024 16:39:20 -0300 Subject: [PATCH] block: ssg-iosched: adapt to new patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../block/ssg-iosched.c:684:41: error: too few arguments to function call, expected 3, have 2 684 | if (blk_mq_sched_try_insert_merge(q, rq)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ../block/blk-mq-sched.h:15:6: note: 'blk_mq_sched_try_insert_merge' declared here 15 | bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq, | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 16 | struct list_head *free); | ~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Signed-off-by: Nahuel Gómez --- block/ssg-iosched.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block/ssg-iosched.c b/block/ssg-iosched.c index 4cb3b58cf..ee3d56823 100755 --- a/block/ssg-iosched.c +++ b/block/ssg-iosched.c @@ -674,6 +674,7 @@ static void ssg_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, struct request_queue *q = hctx->queue; struct ssg_data *ssg = q->elevator->elevator_data; const int data_dir = rq_data_dir(rq); + LIST_HEAD(free); /* * This may be a requeue of a write request that has locked its @@ -681,8 +682,10 @@ static void ssg_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, */ blk_req_zone_write_unlock(rq); - if (blk_mq_sched_try_insert_merge(q, rq)) + if (blk_mq_sched_try_insert_merge(q, rq, &free)) { + blk_mq_free_requests(&free); return; + } blk_mq_sched_request_inserted(rq);