1 files changed, 12 insertions, 9 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index b355b5957cd7..8b309e81ed0f 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -801,9 +801,18 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
        if (unlikely(test_bit(BLK_MQ_S_STOPPED, &hctx->state)))
                return;
-        if (!async && cpumask_test_cpu(smp_processor_id(), hctx->cpumask))
+        if (!async) {
-                __blk_mq_run_hw_queue(hctx);
+                preempt_disable();
-        else if (hctx->queue->nr_hw_queues == 1)
+                if (cpumask_test_cpu(smp_processor_id(), hctx->cpumask)) {
+                        __blk_mq_run_hw_queue(hctx);
+                        preempt_enable();
+                        return;
+                }
+                preempt_enable();
+        }
+        if (hctx->queue->nr_hw_queues == 1)
                kblockd_schedule_delayed_work(&hctx->run_work, 0);
        else {
                unsigned int cpu;
@@ -824,9 +833,7 @@ void blk_mq_run_queues(struct request_queue *q, bool async)
                    test_bit(BLK_MQ_S_STOPPED, &hctx->state))
                        continue;
-                preempt_disable();
                blk_mq_run_hw_queue(hctx, async);
-                preempt_enable();
        }
 }
 EXPORT_SYMBOL(blk_mq_run_queues);
@@ -853,9 +860,7 @@ void blk_mq_start_hw_queue(struct blk_mq_hw_ctx *hctx)
 {
        clear_bit(BLK_MQ_S_STOPPED, &hctx->state);
-        preempt_disable();
        blk_mq_run_hw_queue(hctx, false);
-        preempt_enable();
 }
 EXPORT_SYMBOL(blk_mq_start_hw_queue);
@@ -880,9 +885,7 @@ void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async)
                        continue;
                clear_bit(BLK_MQ_S_STOPPED, &hctx->state);
-                preempt_disable();
                blk_mq_run_hw_queue(hctx, async);
-                preempt_enable();
        }
 }
 EXPORT_SYMBOL(blk_mq_start_stopped_hw_queues);