Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8df5bc2d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: Make del_gendisk() safer for disks without queues"

parents 0802e8d6 70c8d6d6
Loading
Loading
Loading
Loading
+10 −6
Original line number Diff line number Diff line
@@ -656,12 +656,16 @@ void del_gendisk(struct gendisk *disk)
	disk->flags &= ~GENHD_FL_UP;

	sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi");
	if (disk->queue) {
		/*
	 * Unregister bdi before releasing device numbers (as they can get
	 * reused and we'd get clashes in sysfs).
		 * Unregister bdi before releasing device numbers (as they can
		 * get reused and we'd get clashes in sysfs).
		 */
		bdi_unregister(&disk->queue->backing_dev_info);
		blk_unregister_queue(disk);
	} else {
		WARN_ON(1);
	}
	blk_unregister_region(disk_devt(disk), disk->minors);

	part_stat_set_all(&disk->part0, 0);