From ebc403fe282864eddfd68ab1793f149a1b0eb1cd Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Mon, 6 Apr 2020 22:56:10 +0300 Subject: [PATCH] zbd: fixup ->zone_size_log2 if zone size is not power of 2 Code like this doesn't work if log2 is 0xffffffff. if (f->zbd_info->zone_size_log2 > 0) zone_idx = offset >> f->zbd_info->zone_size_log2; else zone_idx = offset / f->zbd_info->zone_size; Other than that everything else works! Reviewed-by: Damien Le Moal Signed-off-by: Alexey Dobriyan (SK hynix) Signed-off-by: Jens Axboe --- zbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zbd.c b/zbd.c index d12d6a7a..e2f3f52f 100644 --- a/zbd.c +++ b/zbd.c @@ -398,7 +398,7 @@ static int init_zone_info(struct thread_data *td, struct fio_file *f) f->zbd_info = zbd_info; f->zbd_info->zone_size = zone_size; f->zbd_info->zone_size_log2 = is_power_of_2(zone_size) ? - ilog2(zone_size) : -1; + ilog2(zone_size) : 0; f->zbd_info->nr_zones = nr_zones; pthread_mutexattr_destroy(&attr); return 0; @@ -515,7 +515,7 @@ static int parse_zone_info(struct thread_data *td, struct fio_file *f) f->zbd_info = zbd_info; f->zbd_info->zone_size = zone_size; f->zbd_info->zone_size_log2 = is_power_of_2(zone_size) ? - ilog2(zone_size) : -1; + ilog2(zone_size) : 0; f->zbd_info->nr_zones = nr_zones; zbd_info = NULL; ret = 0; -- 2.25.1