Commit 40b3a52f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20210818144542.19305-2-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d152c682
...@@ -579,7 +579,7 @@ void del_gendisk(struct gendisk *disk) ...@@ -579,7 +579,7 @@ void del_gendisk(struct gendisk *disk)
{ {
might_sleep(); might_sleep();
if (WARN_ON_ONCE(!disk->queue)) if (WARN_ON_ONCE(!disk_live(disk)))
return; return;
blk_integrity_del(disk); blk_integrity_del(disk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment