diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-06-28 16:08:19 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-06-28 16:08:19 -0600 |
| commit | 3a08284ff22080e742814dad1dbabb4b66349642 (patch) | |
| tree | 3de2163fedca694e9b71f5d54eff8847a7875e7e /block/blk-mq.c | |
| parent | 89181f544ffa4da682b0145738342f9b78b9e8dc (diff) | |
| parent | 6d85ebf95c44e52337ca1d07f0db4b435d1e6762 (diff) | |
| download | linux-rpi-3a08284ff22080e742814dad1dbabb4b66349642.tar.gz linux-rpi-3a08284ff22080e742814dad1dbabb4b66349642.tar.bz2 linux-rpi-3a08284ff22080e742814dad1dbabb4b66349642.zip | |
Merge branch 'for-6.5/block-late' into block-6.5
* for-6.5/block-late:
blk-sysfs: add a new attr_group for blk_mq
blk-iocost: move wbt_enable/disable_default() out of spinlock
blk-wbt: cleanup rwb_enabled() and wbt_disabled()
blk-wbt: remove dead code to handle wbt enable/disable with io inflight
blk-wbt: don't create wbt sysfs entry if CONFIG_BLK_WBT is disabled
blk-mq: fix two misuses on RQF_USE_SCHED
blk-throttle: Fix io statistics for cgroup v1
bcache: Fix bcache device claiming
bcache: Alloc holder object before async registration
raid10: avoid spin_lock from fastpath from raid10_unplug()
md: fix 'delete_mutex' deadlock
md: use mddev->external to select holder in export_rdev()
md/raid1-10: fix casting from randomized structure in raid1_submit_write()
md/raid10: fix the condition to call bio_end_io_acct()
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index decb6ab2d508..98eb31ff914d 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1280,7 +1280,11 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq) if (!plug->multiple_queues && last && last->q != rq->q) plug->multiple_queues = true; - if (!plug->has_elevator && (rq->rq_flags & RQF_USE_SCHED)) + /* + * Any request allocated from sched tags can't be issued to + * ->queue_rqs() directly + */ + if (!plug->has_elevator && (rq->rq_flags & RQF_SCHED_TAGS)) plug->has_elevator = true; rq->rq_next = NULL; rq_list_add(&plug->mq_list, rq); |