block: refine the disk_live check in del_gendisk

Christoph Hellwig · axboe · commit 9f2869921f2a · 2021-08-24T10:10:08.000-06:00
hidden gendisks will never be marked live. Fixes: 40b3a52 ("block: add a sanity check for a live disk in del_gendisk") Reported-by: Bruno Goncalves <bgoncalv@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20210824144310.1487816-1-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/block/genhd.c b/block/genhd.c
@@ -556,7 +556,7 @@ void del_gendisk(struct gendisk *disk)
 {
 	might_sleep();
 
-	if (WARN_ON_ONCE(!disk_live(disk)))
+	if (WARN_ON_ONCE(!disk_live(disk) && !(disk->flags & GENHD_FL_HIDDEN)))
 		return;
 
 	blk_integrity_del(disk);

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ void del_gendisk(struct gendisk *disk)`
`556`	`556`	`{`
`557`	`557`	`might_sleep();`
`558`	`558`
`559`		`- if (WARN_ON_ONCE(!disk_live(disk)))`
	`559`	`+ if (WARN_ON_ONCE(!disk_live(disk) && !(disk->flags & GENHD_FL_HIDDEN)))`
`560`	`560`	`return;`
`561`	`561`
`562`	`562`	`blk_integrity_del(disk);`