diff mbox series

block: refine the disk_live check in del_gendisk

Message ID 20210824144310.1487816-1-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series block: refine the disk_live check in del_gendisk | expand

Commit Message

Christoph Hellwig Aug. 24, 2021, 2:43 p.m. UTC 
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>
---
 block/genhd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jens Axboe Aug. 24, 2021, 4:10 p.m. UTC | #1 
On 8/24/21 8:43 AM, Christoph Hellwig wrote:
> hidden gendisks will never be marked live.

Applied, thanks.
diff mbox series

Patch

diff --git a/block/genhd.c b/block/genhd.c
index a925f773145f..6a5c85aa2e31 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -591,7 +591,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);