diff options
authorArnd Bergmann <>2016-10-21 17:42:33 +0200
committerJens Axboe <>2016-10-24 20:51:22 -0600
commit3c4da75814c4b8871116940eb32d3a5243026918 (patch)
parent89d9475610771b5e5fe1879075f0fc9ba6e3755f (diff)
block: zoned: fix harmless maybe-uninitialized warning
The blkdev_report_zones produces a harmless warning when -Wmaybe-uninitialized is set, after gcc gets a little confused about the multiple 'goto' here: block/blk-zoned.c: In function 'blkdev_report_zones': block/blk-zoned.c:188:13: error: 'nz' may be used uninitialized in this function [-Werror=maybe-uninitialized] Moving the assignment to nr_zones makes this a little simpler while also avoiding the warning reliably. I'm removing the extraneous initialization of 'int ret' in the same patch, as that is semi-related and could cause an uninitialized use of that variable to not produce a warning. Fixes: 6a0cb1bc106f ("block: Implement support for zoned block devices") Signed-off-by: Arnd Bergmann <> Reviewed-by: Shaun Tancheff <> Reviewed-by: Damien Le Moal <> Signed-off-by: Jens Axboe <>
1 files changed, 2 insertions, 4 deletions
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 667f95d86695..472211fa183a 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -80,7 +80,7 @@ int blkdev_report_zones(struct block_device *bdev,
unsigned int i, n, nz;
unsigned int ofst;
void *addr;
- int ret = 0;
+ int ret;
if (!q)
return -ENXIO;
@@ -179,14 +179,12 @@ int blkdev_report_zones(struct block_device *bdev,
+ *nr_zones = nz;
bio_for_each_segment_all(bv, bio, i)
- if (ret == 0)
- *nr_zones = nz;
return ret;