Recent changes (master)

Jens Axboe
2020-06-04T12:00:28Z

The following changes since commit 63a4b9cca4ba3aa4101051402cbbe946ced17a49:

gfio: don't have multiple versions of main_ui (2020-06-02 08:20:03 -0600)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 00ca8df5468e90bbf1256ec90fc9ae14b1706ccc:

zbd: Fix max_open_zones checks (2020-06-03 20:15:35 -0600)

----------------------------------------------------------------
Shin'ichiro Kawasaki (1):
zbd: Fix max_open_zones checks

zbd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

---

Diff of recent changes:

diff --git a/zbd.c b/zbd.c
index a7572c9a..dc302606 100644
--- 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);