|
|
@@ -745,13 +745,13 @@ static void blk_mq_requeue_work(struct work_struct *work)
|
|
|
|
|
|
rq->rq_flags &= ~RQF_SOFTBARRIER;
|
|
|
list_del_init(&rq->queuelist);
|
|
|
- blk_mq_sched_insert_request(rq, true, false, false, true);
|
|
|
+ blk_mq_sched_insert_request(rq, true, false, false);
|
|
|
}
|
|
|
|
|
|
while (!list_empty(&rq_list)) {
|
|
|
rq = list_entry(rq_list.next, struct request, queuelist);
|
|
|
list_del_init(&rq->queuelist);
|
|
|
- blk_mq_sched_insert_request(rq, false, false, false, true);
|
|
|
+ blk_mq_sched_insert_request(rq, false, false, false);
|
|
|
}
|
|
|
|
|
|
blk_mq_run_hw_queues(q, false);
|
|
|
@@ -1773,13 +1773,11 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static void __blk_mq_fallback_to_insert(struct blk_mq_hw_ctx *hctx,
|
|
|
- struct request *rq,
|
|
|
+static void __blk_mq_fallback_to_insert(struct request *rq,
|
|
|
bool run_queue, bool bypass_insert)
|
|
|
{
|
|
|
if (!bypass_insert)
|
|
|
- blk_mq_sched_insert_request(rq, false, run_queue, false,
|
|
|
- hctx->flags & BLK_MQ_F_BLOCKING);
|
|
|
+ blk_mq_sched_insert_request(rq, false, run_queue, false);
|
|
|
else
|
|
|
blk_mq_request_bypass_insert(rq, run_queue);
|
|
|
}
|
|
|
@@ -1811,7 +1809,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
|
|
|
|
|
|
return __blk_mq_issue_directly(hctx, rq, cookie);
|
|
|
insert:
|
|
|
- __blk_mq_fallback_to_insert(hctx, rq, run_queue, bypass_insert);
|
|
|
+ __blk_mq_fallback_to_insert(rq, run_queue, bypass_insert);
|
|
|
if (bypass_insert)
|
|
|
return BLK_STS_RESOURCE;
|
|
|
|
|
|
@@ -1830,7 +1828,7 @@ static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
|
|
|
|
|
|
ret = __blk_mq_try_issue_directly(hctx, rq, cookie, false);
|
|
|
if (ret == BLK_STS_RESOURCE)
|
|
|
- __blk_mq_fallback_to_insert(hctx, rq, true, false);
|
|
|
+ __blk_mq_fallback_to_insert(rq, true, false);
|
|
|
else if (ret != BLK_STS_OK)
|
|
|
blk_mq_end_request(rq, ret);
|
|
|
|
|
|
@@ -1960,7 +1958,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
|
|
|
} else if (q->elevator) {
|
|
|
blk_mq_put_ctx(data.ctx);
|
|
|
blk_mq_bio_to_request(rq, bio);
|
|
|
- blk_mq_sched_insert_request(rq, false, true, true, true);
|
|
|
+ blk_mq_sched_insert_request(rq, false, true, true);
|
|
|
} else {
|
|
|
blk_mq_put_ctx(data.ctx);
|
|
|
blk_mq_bio_to_request(rq, bio);
|