Commit 5e2e1cc4 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Jens Axboe
Browse files

zram: 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>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Link: https://lore.kernel.org/r/20211015235219.2191207-9-mcgrof@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 15dfc662

drivers/block/zram/zram_drv.c

+5 −1
Original line number Diff line number Diff line
@@ -1949,7 +1949,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));
@@ -1957,6 +1959,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(&zram_index_idr, device_id);

out_free_dev: