summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2017-02-10 11:15:08 -0700
committerJens Axboe <axboe@fb.com>2017-02-10 11:15:08 -0700
commite74f8bcd534247fac1aa78b40f7a707b638d72d9 (patch)
treef0f0fd48a808530c08f4a087b50d2b7e19fb4d4c
parentdb658d9b39102f166bbae7c627efb4b72b6980da (diff)
parentf6f94300cda0f85180a0dd8838d1cc855661e239 (diff)
Merge branch 'for-4.11/next' into for-next
-rw-r--r--block/blk-mq.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 89cb2d224488..5564a9d103ca 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2626,10 +2626,14 @@ void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues)
list_for_each_entry(q, &set->tag_list, tag_set_list) {
blk_mq_realloc_hw_ctxs(set, q);
+ /*
+ * Manually set the make_request_fn as blk_queue_make_request
+ * resets a lot of the queue settings.
+ */
if (q->nr_hw_queues > 1)
- blk_queue_make_request(q, blk_mq_make_request);
+ q->make_request_fn = blk_mq_make_request;
else
- blk_queue_make_request(q, blk_sq_make_request);
+ q->make_request_fn = blk_sq_make_request;
blk_mq_queue_reinit(q, cpu_online_mask);
}