--- y/block/genhd.c
+++ x/block/genhd.c
@@ -648,6 +648,7 @@ void del_gendisk(struct gendisk *disk)
 
 	blk_throtl_cancel_bios(disk->queue);
 
+	rq_qos_exit(q);
 	blk_sync_queue(q);
 	blk_flush_integrity();
 	/*
@@ -1139,7 +1140,6 @@ static void disk_release_mq(struct reque
 		elevator_exit(q);
 		mutex_unlock(&q->sysfs_lock);
 	}
-	rq_qos_exit(q);
 	__blk_mq_unfreeze_queue(q, true);
 }