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

block/rsxx: 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>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7b505627

drivers/block/rsxx/core.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/rsxx/dev.c

+9 −3
Original line number Diff line number Diff line
@@ -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. */
@@ -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);

		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)