[PATCH 2/3] block: revert aec89dc5d421 block: keep q_usage_counter in atomic mode after del_gendisk
From: Ming Lei <hidden>
Date: 2022-01-16 04:19:27
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Prepare for revert commit 8e141f9eb803 ("block: drain file system I/O
on del_gendisk").
Signed-off-by: Ming Lei <redacted>
---
block/blk-mq.c | 9 +--------
block/blk.h | 1 -
block/genhd.c | 3 +--
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index a6d4780580fc..cb979dcf7986 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c@@ -215,11 +215,9 @@ void blk_mq_freeze_queue(struct request_queue *q) } EXPORT_SYMBOL_GPL(blk_mq_freeze_queue); -void __blk_mq_unfreeze_queue(struct request_queue *q, bool force_atomic) +void blk_mq_unfreeze_queue(struct request_queue *q) { mutex_lock(&q->mq_freeze_lock); - if (force_atomic) - q->q_usage_counter.data->force_atomic = true; q->mq_freeze_depth--; WARN_ON_ONCE(q->mq_freeze_depth < 0); if (!q->mq_freeze_depth) {
@@ -228,11 +226,6 @@ void __blk_mq_unfreeze_queue(struct request_queue *q, bool force_atomic) } mutex_unlock(&q->mq_freeze_lock); } - -void blk_mq_unfreeze_queue(struct request_queue *q) -{ - __blk_mq_unfreeze_queue(q, false); -} EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue); /*
diff --git a/block/blk.h b/block/blk.h
index 8bd43b3ad33d..9ee7ab1c5572 100644
--- a/block/blk.h
+++ b/block/blk.h@@ -43,7 +43,6 @@ struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size, void blk_free_flush_queue(struct blk_flush_queue *q); void blk_freeze_queue(struct request_queue *q); -void __blk_mq_unfreeze_queue(struct request_queue *q, bool force_atomic); void blk_queue_start_drain(struct request_queue *q); int __bio_queue_enter(struct request_queue *q, struct bio *bio); bool submit_bio_checks(struct bio *bio);
diff --git a/block/genhd.c b/block/genhd.c
index 6357cab37eef..9842371904d6 100644
--- a/block/genhd.c
+++ b/block/genhd.c@@ -628,8 +628,7 @@ void del_gendisk(struct gendisk *disk) /* * Allow using passthrough request again after the queue is torn down. */ - blk_queue_flag_clear(QUEUE_FLAG_INIT_DONE, q); - __blk_mq_unfreeze_queue(q, true); + blk_mq_unfreeze_queue(q); } EXPORT_SYMBOL(del_gendisk);
--
2.31.1