diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-09-19 16:40:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-28 11:32:28 +0200 |
| commit | 48a12961e800aa404fefa845aa95098d18a30f19 (patch) | |
| tree | 667a6ba5be4f20d1754a9d07dd6d6e425f8eb022 | |
| parent | 398a0fdb38d9ab5e68023667cc5e6e3d109e2d6b (diff) | |
Revert "block: freeze the queue earlier in del_gendisk"
commit 4c66a326b5ab784cddd72de07ac5b6210e9e1b06 upstream.
This reverts commit a09b314005f3a0956ebf56e01b3b80339df577cc.
Dusty Mabe reported consistent hang during CoreOS shutdown with a MD
RAID1 setup. Although apparently similar hangs happened before,
and this patch most likely is not the root cause it made it much
more severe. Revert it until we can figure out what is going on
with the md driver.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220919144049.978907-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | block/genhd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index e7ab9f3b869c..a39c416d658f 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -625,7 +625,6 @@ void del_gendisk(struct gendisk *disk) * Prevent new I/O from crossing bio_queue_enter(). */ blk_queue_start_drain(q); - blk_mq_freeze_queue_wait(q); if (!(disk->flags & GENHD_FL_HIDDEN)) { sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi"); @@ -649,6 +648,8 @@ void del_gendisk(struct gendisk *disk) pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); device_del(disk_to_dev(disk)); + blk_mq_freeze_queue_wait(q); + blk_throtl_cancel_bios(disk->queue); blk_sync_queue(q); |