block: ssg-iosched: adapt to new patches
../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 <nahuelgomez329@gmail.com>
This commit is contained in:
parent
82eba12440
commit
a4d33f6631
1 changed files with 4 additions and 1 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue