verify: convert verify buf too small warning to fio_did_warn()

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

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

+       FIO_WARN_VERIFY_BUF     = 2,

 };
 
 #ifdef FIO_INC_DEBUG
 };
 
 #ifdef FIO_INC_DEBUG

diff --git a/verify.c b/verify.c
index b178450714d18bde73c2d52746393d1499364f7f..aeafdb5da318c0b6d789e93d991720d71caa8d2d 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -241,7 +241,6 @@ struct vcont {
 };
 
 #define DUMP_BUF_SZ    255
 };
 
 #define DUMP_BUF_SZ    255

-static int dump_buf_warned;

 
 static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
                     const char *type, struct fio_file *f)
 
 static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
                     const char *type, struct fio_file *f)


@@ -260,10 +259,8 @@ static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
 
        buf_left -= strlen(fname);
        if (buf_left <= 0) {
 
        buf_left -= strlen(fname);
        if (buf_left <= 0) {

-               if (!dump_buf_warned) {
+               if (!fio_did_warn(FIO_WARN_VERIFY_BUF))

                        log_err("fio: verify failure dump buffer too small\n");
                        log_err("fio: verify failure dump buffer too small\n");

-                       dump_buf_warned = 1;
-               }

                free(ptr);
                return;
        }
                free(ptr);
                return;
        }