Re: [PATCH 08/13] zram: add error handling support for add_disk()

[Minchan Kim]

On Fri, Oct 15, 2021 at 04:52:14PM -0700, Luis Chamberlain wrote:
> 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 
Acked-by: Minchan Kim 

[PATCH 08/13] zram: add error handling support for add_disk()

[Luis Chamberlain]

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 
---
 drivers/block/zram/zram_drv.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 0a9309a2ef54..bdbded107e6b 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1983,7 +1983,9 @@ static int zram_add(void)
blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX);
 
blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, zram->disk->queue);
-   device_add_disk(NULL, zram->disk, zram_disk_attr_groups);
+   ret = device_add_disk(NULL, zram->disk, zram_disk_attr_groups);
+   if (ret)
+   goto out_cleanup_disk;
 
strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));
 
@@ -1991,6 +1993,8 @@ static int zram_add(void)
pr_info("Added device: %s\n", zram->disk->disk_name);
return device_id;
 
+out_cleanup_disk:
+   blk_cleanup_disk(zram->disk);
 out_free_idr:
idr_remove(_index_idr, device_id);
 out_free_dev:
-- 
2.30.2