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: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 997b7dc095b9185ee84457af31299e35243fe961..ae8d4bc532b0baefc64ef3ed878285a96f3d0b8c 100644 (file)
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -1561,7 +1561,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)
@@ -1579,7 +1578,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 {