diff --git a/block/blk-core.c b/block/blk-core.c
index bb4d3da762b1e7bd0e5635e1c08cb38b9a8c6905..41d0b09e9a67317b9571cf1c01334a90fd3361e0 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -812,7 +812,7 @@ void blk_cleanup_queue(struct request_queue *q)
 	 */
 	if (q->mq_ops && (blk_queue_init_done(q) ||
 			test_bit(QUEUE_FLAG_FORECE_QUIESCE, &q->queue_flags)))
-		blk_mq_quiesce_queue(q);
+		blk_mq_quiesce_queue_internal(q);
 
 	/* for synchronous bio-based driver finish in-flight integrity i/o */
 	blk_flush_integrity();
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 8bf3da9b7178e2d8d66ca47e4766fdc86e83c642..0732bcc65f8899523287354e7798caa8b8f8f92c 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3125,7 +3125,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr)
 		return -EINVAL;
 
 	blk_mq_freeze_queue(q);
-	blk_mq_quiesce_queue(q);
+	blk_mq_quiesce_queue_internal(q);
 
 	ret = 0;
 	queue_for_each_hw_ctx(q, hctx, i) {
@@ -3151,7 +3151,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr)
 	if (!ret)
 		q->nr_requests = nr;
 
-	blk_mq_unquiesce_queue(q);
+	blk_mq_unquiesce_queue_internal(q);
 	blk_mq_unfreeze_queue(q);
 
 	return ret;
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 4167f6a5c3f86ff59759f2ce1a296bc7800627d3..7ce092ab0f057d6aff3aa1b2a73818d594df32ce 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -461,7 +461,7 @@ static ssize_t queue_wb_lat_store(struct request_queue *q, const char *page,
 	 */
 	if (q->mq_ops) {
 		blk_mq_freeze_queue(q);
-		blk_mq_quiesce_queue(q);
+		blk_mq_quiesce_queue_internal(q);
 	} else
 		blk_queue_bypass_start(q);
 
@@ -469,7 +469,7 @@ static ssize_t queue_wb_lat_store(struct request_queue *q, const char *page,
 	wbt_update_limits(q);
 
 	if (q->mq_ops) {
-		blk_mq_unquiesce_queue(q);
+		blk_mq_unquiesce_queue_internal(q);
 		blk_mq_unfreeze_queue(q);
 	} else
 		blk_queue_bypass_end(q);
diff --git a/block/elevator.c b/block/elevator.c
index 34ff47fd913e3a1a56d72b8614ab2bb303dec04e..70ea9f3e64d7e97aeb96136cd75e6a1810a3bdb0 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -1021,11 +1021,11 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)
 
 	if (q->mq_ops) {
 		blk_mq_freeze_queue(q);
-		blk_mq_quiesce_queue(q);
+		blk_mq_quiesce_queue_internal(q);
 
 		err = elevator_switch_mq(q, new_e);
 
-		blk_mq_unquiesce_queue(q);
+		blk_mq_unquiesce_queue_internal(q);
 		blk_mq_unfreeze_queue(q);
 
 		return err;