Commit dbb301f9 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Jens Axboe
Browse files

virtio_blk: 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.

Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20210818144542.19305-11-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 83cbce95

drivers/block/virtio_blk.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -875,9 +875,14 @@ static int virtblk_probe(struct virtio_device *vdev) 
	virtblk_update_capacity(vblk, false);

	virtblk_update_capacity(vblk, false);

	virtio_device_ready(vdev);

	virtio_device_ready(vdev);





	device_add_disk(&vdev->dev, vblk->disk, virtblk_attr_groups);

	err = device_add_disk(&vdev->dev, vblk->disk, virtblk_attr_groups);

	if (err)

		goto out_cleanup_disk;



	return 0;

	return 0;





out_cleanup_disk:

	blk_cleanup_disk(vblk->disk);

out_free_tags:

out_free_tags:

	blk_mq_free_tag_set(&vblk->tag_set);

	blk_mq_free_tag_set(&vblk->tag_set);

out_free_vq:

out_free_vq: