From: Christoph Hellwig <hch@lst.de>
Date: Tue, 24 Aug 2021 14:43:10 +0000 (+0200)
Subject: block: refine the disk_live check in del_gendisk
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9f2869921f2a102e209297d4f742f34b46ed3d36;p=linux.git

block: refine the disk_live check in del_gendisk

hidden gendisks will never be marked live.

Fixes: 40b3a52ffc5b ("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
index 6a5b65c86c4b..567549a011d1 100644
--- 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);