Skip to content

Commit

Permalink
block/rsxx: add error handling support for add_disk()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luis Chamberlain authored and Jens Axboe committed Oct 18, 2021
1 parent 7b50562 commit 54494d1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
4 changes: 3 additions & 1 deletion drivers/block/rsxx/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,9 @@ static int rsxx_pci_probe(struct pci_dev *dev,
card->size8 = 0;
}

rsxx_attach_dev(card);
st = rsxx_attach_dev(card);
if (st)
goto failed_create_dev;

/************* Setup Debugfs *************/
rsxx_debugfs_dev_new(card);
Expand Down
12 changes: 9 additions & 3 deletions drivers/block/rsxx/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ static bool rsxx_discard_supported(struct rsxx_cardinfo *card)

int rsxx_attach_dev(struct rsxx_cardinfo *card)
{
int err = 0;

mutex_lock(&card->dev_lock);

/* The block device requires the stripe size from the config. */
Expand All @@ -199,13 +201,17 @@ int rsxx_attach_dev(struct rsxx_cardinfo *card)
set_capacity(card->gendisk, card->size8 >> 9);
else
set_capacity(card->gendisk, 0);
device_add_disk(CARD_TO_DEV(card), card->gendisk, NULL);
card->bdev_attached = 1;
err = device_add_disk(CARD_TO_DEV(card), card->gendisk, NULL);
if (err == 0)
card->bdev_attached = 1;
}

mutex_unlock(&card->dev_lock);

return 0;
if (err)
blk_cleanup_disk(card->gendisk);

return err;
}

void rsxx_detach_dev(struct rsxx_cardinfo *card)
Expand Down

0 comments on commit 54494d1

Please sign in to comment.