Merge branch 'atomics' of https://github.com/bvanassche/fio

[fio.git] / zbd.c

diff --git a/zbd.c b/zbd.c
index a7572c9a0a6020a55aa8da4ba6b276b7a050d333..8cf8f81213ebfcd8083a2f3602932deec9c276cc 100644 (file)
--- a/zbd.c
+++ b/zbd.c
@@ -989,7 +989,7 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 
        assert(is_valid_offset(f, io_u->offset));
 
-       if (td->o.job_max_open_zones) {
+       if (td->o.max_open_zones || td->o.job_max_open_zones) {
                /*
                 * This statement accesses f->zbd_info->open_zones[] on purpose
                 * without locking.
@@ -1018,7 +1018,7 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 
                zone_lock(td, f, z);
                pthread_mutex_lock(&f->zbd_info->mutex);
-               if (td->o.job_max_open_zones == 0)
+               if (td->o.max_open_zones == 0 && td->o.job_max_open_zones == 0)
                        goto examine_zone;
                if (f->zbd_info->num_open_zones == 0) {
                        pthread_mutex_unlock(&f->zbd_info->mutex);
@@ -1074,7 +1074,7 @@ examine_zone:
        }
        dprint(FD_ZBD, "%s(%s): closing zone %d\n", __func__, f->file_name,
               zone_idx);
-       if (td->o.job_max_open_zones)
+       if (td->o.max_open_zones || td->o.job_max_open_zones)
                zbd_close_zone(td, f, open_zone_idx);
        pthread_mutex_unlock(&f->zbd_info->mutex);
 
@@ -1365,7 +1365,7 @@ void setup_zbd_zone_mode(struct thread_data *td, struct io_u *io_u)
 }
 
 /**
- * zbd_adjust_ddir - Adjust an I/O direction for zonedmode=zbd.
+ * zbd_adjust_ddir - Adjust an I/O direction for zonemode=zbd.
  *
  * @td: FIO thread data.
  * @io_u: FIO I/O unit.