The following changes since commit 5b347a1d4e5fd81b6a1b515843b834c39fb3463d: Merge branch 'directory-operation' of https://github.com/friendy-su/fio (2024-04-16 11:04:58 -0400) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to e0bb44a5b2a67695f0b940772c70f678b323ec54: t/io_uring: only calculate per-file depth if we have files (2024-04-17 16:34:47 -0600) ---------------------------------------------------------------- Ankit Kumar (1): ioengines: bump up FIO_IOOPS_VERSION Jens Axboe (2): Merge branch 'ioops_ver' of https://github.com/ankit-sam/fio t/io_uring: only calculate per-file depth if we have files Vincent Fu (1): github: add reminders to PR template .github/PULL_REQUEST_TEMPLATE.md | 7 +++++++ ioengines.h | 2 +- t/io_uring.c | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) --- Diff of recent changes: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4d98a694..6cead5b3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,3 +6,10 @@ Please confirm that your commit message(s) follow these guidelines: aren't something like a URL at 72-74 chars. 4. Empty line 5. Signed-off-by: Real Name <real@xxxxxxxxx> + +Reminders: + +1. If you modify struct thread_options, also make corresponding changes in + cconv.c and bump FIO_SERVER_VER in server.h +2. If you change the ioengine interface (hooks, flags, etc), remember to bump + FIO_IOOPS_VERSION in ioengines.h. diff --git a/ioengines.h b/ioengines.h index 2fd7f52c..e43650f7 100644 --- a/ioengines.h +++ b/ioengines.h @@ -9,7 +9,7 @@ #include "zbd_types.h" #include "fdp.h" -#define FIO_IOOPS_VERSION 33 +#define FIO_IOOPS_VERSION 34 #ifndef CONFIG_DYNAMIC_ENGINES #define FIO_STATIC static diff --git a/t/io_uring.c b/t/io_uring.c index 18e8b38e..aa6e09e9 100644 --- a/t/io_uring.c +++ b/t/io_uring.c @@ -974,7 +974,9 @@ static int setup_ring(struct submitter *s) for (i = 0; i < p.sq_entries; i++) sring->array[i] = i; - s->per_file_depth = (depth + s->nr_files - 1) / s->nr_files; + s->per_file_depth = INT_MAX; + if (s->nr_files) + s->per_file_depth = (depth + s->nr_files - 1) / s->nr_files; return 0; }
