iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Luis Chamberlain 2021-11-03 16:04:31 -07:00 committed by Jens Axboe
parent 15733754cc
commit f583eaef0a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/sunvdc.c
View File

@ -826,8 +826,8 @@ static int probe_disk(struct vdc_port *port)
if (IS_ERR(g)) { if (IS_ERR(g)) {
printk(KERN_ERR PFX "%s: Could not allocate gendisk.\n", printk(KERN_ERR PFX "%s: Could not allocate gendisk.\n",
port->vio.name); port->vio.name);
blk_mq_free_tag_set(&port->tag_set); err = PTR_ERR(g);
return PTR_ERR(g); goto out_free_tag;
} }
port->disk = g; port->disk = g;
@ -879,9 +879,17 @@ static int probe_disk(struct vdc_port *port)
port->vdisk_size, (port->vdisk_size >> (20 - 9)), port->vdisk_size, (port->vdisk_size >> (20 - 9)),
port->vio.ver.major, port->vio.ver.minor); 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; 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 = { static struct ldc_channel_config vdc_ldc_cfg = {