Commit c98c3d09 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

block: cleanup the !zoned case in blk_revalidate_disk_zones

blk_revalidate_disk_zones is never called for non-zoned devices.  Just
return early and warn instead of trying to handle this case.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d9dd7308
...@@ -520,6 +520,9 @@ int blk_revalidate_disk_zones(struct gendisk *disk) ...@@ -520,6 +520,9 @@ int blk_revalidate_disk_zones(struct gendisk *disk)
sector_t sector = 0; sector_t sector = 0;
int ret = 0; int ret = 0;
if (WARN_ON_ONCE(!blk_queue_is_zoned(q)))
return -EIO;
/* /*
* BIO based queues do not use a scheduler so only q->nr_zones * BIO based queues do not use a scheduler so only q->nr_zones
* needs to be updated so that the sysfs exposed value is correct. * needs to be updated so that the sysfs exposed value is correct.
...@@ -535,10 +538,8 @@ int blk_revalidate_disk_zones(struct gendisk *disk) ...@@ -535,10 +538,8 @@ int blk_revalidate_disk_zones(struct gendisk *disk)
*/ */
noio_flag = memalloc_noio_save(); noio_flag = memalloc_noio_save();
if (!blk_queue_is_zoned(q) || !nr_zones) { if (!nr_zones)
nr_zones = 0;
goto update; goto update;
}
/* Allocate bitmaps */ /* Allocate bitmaps */
ret = -ENOMEM; ret = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment