diff options
| author | Luis Chamberlain <mcgrof@kernel.org> | 2021-07-13 19:23:29 +0000 |
|---|---|---|
| committer | Luis Chamberlain <mcgrof@kernel.org> | 2021-07-14 20:57:35 -0700 |
| commit | 9a3284fe5f9c6d8eb4f86f92329edcdb5921c8f8 (patch) | |
| tree | d87adbc09d4f2e928809c3a5f07a91dccc91ce3c | |
| parent | de9ee49c8f522d38134bc61bf48fc653b2ff752a (diff) | |
| download | linux-next-9a3284fe5f9c6d8eb4f86f92329edcdb5921c8f8.tar.gz | |
z2ram: 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. Only the disk is cleaned up inside
z2ram_register_disk() as the caller deals with the rest.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
| -rw-r--r-- | drivers/block/z2ram.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 4eef218108c60..6648bbc87c306 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c @@ -318,6 +318,7 @@ static const struct blk_mq_ops z2_mq_ops = { static int z2ram_register_disk(int minor) { struct gendisk *disk; + int err; disk = blk_mq_alloc_disk(&tag_set, NULL); if (IS_ERR(disk)) @@ -333,8 +334,10 @@ static int z2ram_register_disk(int minor) sprintf(disk->disk_name, "z2ram"); z2ram_gendisk[minor] = disk; - add_disk(disk); - return 0; + err = add_disk(disk); + if (err) + blk_cleaup_disk(disk); + return err; } static int __init z2_init(void) |