Merge: Revert "block: freeze the queue earlier in del_gendisk"

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2045

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2155901

Signed-off-by: Ming Lei <ming.lei@redhat.com>

Approved-by: Xiao Ni <xni@redhat.com>
Approved-by: Jeff Moyer <jmoyer@redhat.com>

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>

Author: Herton R. Krzesinski

block/genhd.c

@@ -613,7 +613,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");
@@ -637,6 +636,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);