redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: 979d54475e ("null_blk: cleanup null_gendisk_register")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
alistair/sunxi64-5.5-dsi
Jens Axboe 2019-12-04 09:17:41 -07:00
parent f1acbf2186
commit bca1c43cb2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/null_blk_main.c
View File

@ -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 {