diff options
| author | Niklas Cassel <niklas.cassel@wdc.com> | 2021-05-14 12:52:51 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-05-14 08:57:26 -0600 |
| commit | 6399ab79bf410ac317260614c36f60ad76e5aa35 (patch) | |
| tree | a8fa53d9780e0d76909f820747311f4189d86dea | |
| parent | 30bec59eab3908b681cbc2866179f7166a849c83 (diff) | |
| download | fio-6399ab79bf410ac317260614c36f60ad76e5aa35.tar.gz fio-6399ab79bf410ac317260614c36f60ad76e5aa35.tar.bz2 | |
zbd: only put an upper limit on max open zones once
There is an upper limit that is checked for each td, and for each file,
even though a file has a pointer to a zoned_block_device_info that has
already been created. Multiple files, from the same or from another td
can point to the same zoned_block_device_info.
All zoned_block_device_info:s have already been created earlier in the
call chain.
Simplify this by only checking the upper limit on max open zones when a
zoned_block_device_info is created.
This way, max_open_zones is handled from a single location, instead of
potentially being reassigned from a completely different location.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | zbd.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -588,7 +588,8 @@ static int zbd_create_zone_info(struct thread_data *td, struct fio_file *f) if (ret == 0) { f->zbd_info->model = zbd_model; - f->zbd_info->max_open_zones = td->o.max_open_zones; + f->zbd_info->max_open_zones = + min_not_zero(td->o.max_open_zones, ZBD_MAX_OPEN_ZONES); } return ret; } @@ -726,8 +727,6 @@ int zbd_setup_files(struct thread_data *td) if (zbd_is_seq_job(f)) assert(f->min_zone < f->max_zone); - zbd->max_open_zones = zbd->max_open_zones ?: ZBD_MAX_OPEN_ZONES; - if (td->o.max_open_zones > 0 && zbd->max_open_zones != td->o.max_open_zones) { log_err("Different 'max_open_zones' values\n"); |