| Message ID | 20210818144542.19305-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/11] block: add a sanity check for a live disk in del_gendisk | expand |
On 8/18/21 4:45 PM, Christoph Hellwig wrote: > 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> > --- > block/genhd.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/genhd.c b/block/genhd.c > index 02cd9ec93e52..935f74c652f1 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); > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/block/genhd.c b/block/genhd.c index 02cd9ec93e52..935f74c652f1 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);
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> --- block/genhd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)