block/sunvdc: add error handling support for add_disk()

We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

We re-use the same free tag call, so we also add a label for
that as well.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211103230437.1639990-9-mcgrof@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 4d4bb810c2aea031c849240fd63c867411b8bb5e..6f45a53f7cbf5204e62f04c946d8a6420b6d75f6 100644 (file)
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -826,8 +826,8 @@ static int probe_disk(struct vdc_port *port)
        if (IS_ERR(g)) {
                printk(KERN_ERR PFX "%s: Could not allocate gendisk.\n",
                       port->vio.name);
-               blk_mq_free_tag_set(&port->tag_set);
-               return PTR_ERR(g);
+               err = PTR_ERR(g);
+               goto out_free_tag;
        }
 
        port->disk = g;
@@ -879,9 +879,17 @@ static int probe_disk(struct vdc_port *port)
               port->vdisk_size, (port->vdisk_size >> (20 - 9)),
               port->vio.ver.major, port->vio.ver.minor);
 
-       device_add_disk(&port->vio.vdev->dev, g, NULL);
+       err = device_add_disk(&port->vio.vdev->dev, g, NULL);
+       if (err)
+               goto out_cleanup_disk;
 
        return 0;
+
+out_cleanup_disk:
+       blk_cleanup_disk(g);
+out_free_tag:
+       blk_mq_free_tag_set(&port->tag_set);
+       return err;
 }
 
 static struct ldc_channel_config vdc_ldc_cfg = {