diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/bfq-iosched.c | 3 | ||||
| -rw-r--r-- | block/mq-deadline.c | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 9b7678ad5830..0270cd7ca165 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5957,8 +5957,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, bfqd->in_service_queue != NULL && bfq_tot_busy_queues(bfqd) == 1 + bfq_bfqq_busy(bfqq) && (bfqq->waker_bfqq == bfqd->in_service_queue || - bfqd->in_service_queue->waker_bfqq == bfqq)) || - at_head || blk_rq_is_passthrough(rq)) { + bfqd->in_service_queue->waker_bfqq == bfqq)) || at_head) { if (at_head) list_add(&rq->queuelist, &bfqd->dispatch); else diff --git a/block/mq-deadline.c b/block/mq-deadline.c index f3631a287466..04aded71ead2 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -500,11 +500,8 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, trace_block_rq_insert(rq); - if (at_head || blk_rq_is_passthrough(rq)) { - if (at_head) - list_add(&rq->queuelist, &dd->dispatch); - else - list_add_tail(&rq->queuelist, &dd->dispatch); + if (at_head) { + list_add(&rq->queuelist, &dd->dispatch); } else { deadline_add_rq_rb(dd, rq); |