Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9887e2e authored by Jens Axboe's avatar Jens Axboe Committed by Jaegeuk Kim
Browse files

null_blk: remove unused variable warning on !CONFIG_BLK_DEV_ZONED 



If BLK_DEV_ZONED isn't set, 'ret' isn't used. This makes gcc complain,
rightfully. Move ret where it is used.

Fixes: 979d54475e0b ("null_blk: cleanup null_gendisk_register")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 93eab050

drivers/block/null_blk_main.c

+1 −2
Original line number Diff line number Diff line
@@ -1535,7 +1535,6 @@ static int null_gendisk_register(struct nullb *nullb) 
{

	sector_t size = ((sector_t)nullb->dev->size * SZ_1M) >> SECTOR_SHIFT;

	struct gendisk *disk;

	int ret;



	disk = nullb->disk = alloc_disk_node(1, nullb->dev->home_node);

	if (!disk)
@@ -1553,7 +1552,7 @@ static int null_gendisk_register(struct nullb *nullb) 
#ifdef CONFIG_BLK_DEV_ZONED

	if (nullb->dev->zoned) {

		if (queue_is_mq(nullb->q)) {

			ret = blk_revalidate_disk_zones(disk);

			int ret = blk_revalidate_disk_zones(disk);

			if (ret)

				return ret;

		} else {