From: Christoph Hellwig <hch@lst.de>
Date: Wed, 18 Aug 2021 14:45:32 +0000 (+0200)
Subject: block: add a sanity check for a live disk in del_gendisk
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=40b3a52ffc5bc3b5427d5d35b035cfb19d03fdd6;p=linux.git

block: add a sanity check for a live disk in del_gendisk

Add a sanity check to del_gendisk to do nothing when the disk wasn't
successfully added.  This papers over the complete lack of add_disk
error handling, which is about to get fixed gradually.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20210818144542.19305-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/genhd.c b/block/genhd.c
index 02cd9ec93e52b..935f74c652f17 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -579,7 +579,7 @@ void del_gendisk(struct gendisk *disk)
 {
 	might_sleep();
 
-	if (WARN_ON_ONCE(!disk->queue))
+	if (WARN_ON_ONCE(!disk_live(disk)))
 		return;
 
 	blk_integrity_del(disk);