io_u: convert zoned bug warning to fio_did_warn()

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/debug.h b/debug.h
index d10d43e91dbf011a9439ee19b585817bcf51294c..84d6fafd89c83bd4e9fad37ef0dc0c796e0f5018 100644 (file)
--- a/debug.h
+++ b/debug.h
@@ -42,6 +42,7 @@ static inline bool fio_did_warn(unsigned int mask)
 enum {
        FIO_WARN_ROOT_FLUSH     = 1,
        FIO_WARN_VERIFY_BUF     = 2,
 enum {
        FIO_WARN_ROOT_FLUSH     = 1,
        FIO_WARN_VERIFY_BUF     = 2,

+       FIO_WARN_ZONED_BUG      = 4,

 };
 
 #ifdef FIO_INC_DEBUG
 };
 
 #ifdef FIO_INC_DEBUG

diff --git a/io_u.c b/io_u.c
index 404c75b382ab5e187a23ea33134092e05b40f2a8..b54a79c73d98af9bfac5b749d44d3e0e9d9c1273 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -163,7 +163,6 @@ static int __get_next_rand_offset_zoned_abs(struct thread_data *td,
 {
        struct zone_split_index *zsi;
        uint64_t lastb, send, stotal;
 {
        struct zone_split_index *zsi;
        uint64_t lastb, send, stotal;

-       static int warned;

        unsigned int v;
 
        lastb = last_block(td, f, ddir);
        unsigned int v;
 
        lastb = last_block(td, f, ddir);


@@ -192,10 +191,8 @@ bail:
         * Should never happen
         */
        if (send == -1U) {
         * Should never happen
         */
        if (send == -1U) {

-               if (!warned) {
+               if (!fio_did_warn(FIO_WARN_ZONED_BUG))

                        log_err("fio: bug in zoned generation\n");
                        log_err("fio: bug in zoned generation\n");

-                       warned = 1;
-               }

                goto bail;
        } else if (send > lastb) {
                /*
                goto bail;
        } else if (send > lastb) {
                /*


@@ -223,7 +220,6 @@ static int __get_next_rand_offset_zoned(struct thread_data *td,
 {
        unsigned int v, send, stotal;
        uint64_t offset, lastb;
 {
        unsigned int v, send, stotal;
        uint64_t offset, lastb;

-       static int warned;

        struct zone_split_index *zsi;
 
        lastb = last_block(td, f, ddir);
        struct zone_split_index *zsi;
 
        lastb = last_block(td, f, ddir);


@@ -248,10 +244,8 @@ bail:
         * Should never happen
         */
        if (send == -1U) {
         * Should never happen
         */
        if (send == -1U) {

-               if (!warned) {
+               if (!fio_did_warn(FIO_WARN_ZONED_BUG))

                        log_err("fio: bug in zoned generation\n");
                        log_err("fio: bug in zoned generation\n");

-                       warned = 1;
-               }

                goto bail;
        }
 
                goto bail;
        }