Merge branch 'for-6.1/block' into block-6.1

[platform/kernel/linux-rpi.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index dc9b61d..17b33c6 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -609,7 +609,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");
@@ -633,6 +632,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);
 
        blk_sync_queue(q);