diff options
| author |   Luis Chamberlain <mcgrof@kernel.org> | 2021-09-27 15:02:28 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-10-18 14:41:37 -0600 |
| commit | 27c97abc30e2b9ad2288977c0ecbef4d50553f57 (patch) | |
| tree | c6b119228e8ea612725a628e47ce3e5b736f5736 /drivers/block/rbd.c | |
| parent | cdrom/gdrom: add error handling support for add_disk() (diff) | |
| download | linux-dev-27c97abc30e2b9ad2288977c0ecbef4d50553f57.tar.xz linux-dev-27c97abc30e2b9ad2288977c0ecbef4d50553f57.zip | |
rbd: add add_disk() error handling
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: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | drivers/block/rbd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index bf60aebd0cfb..953fa134cd3d 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -7054,7 +7054,9 @@ static ssize_t do_rbd_add(struct bus_type *bus, if (rc) goto err_out_image_lock; - device_add_disk(&rbd_dev->dev, rbd_dev->disk, NULL); + rc = device_add_disk(&rbd_dev->dev, rbd_dev->disk, NULL); + if (rc) + goto err_out_cleanup_disk; spin_lock(&rbd_dev_list_lock); list_add_tail(&rbd_dev->node, &rbd_dev_list); @@ -7068,6 +7070,8 @@ out: module_put(THIS_MODULE); return rc; +err_out_cleanup_disk: + rbd_free_disk(rbd_dev); err_out_image_lock: rbd_dev_image_unlock(rbd_dev); rbd_dev_device_release(rbd_dev); |