From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 12 Feb 2018 17:18:32 +0000 (-0700)
Subject: io_u: convert zoned bug warning to fio_did_warn()
X-Git-Tag: fio-3.4~2
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=264e3d300d9aa2d9c5acdf8edbd3639fbec784a0;hp=7fc08e9929fefc9a8a2008eddb2e2fcba33fd90a

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 d10d43e9..84d6fafd 100644
--- 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,
+	FIO_WARN_ZONED_BUG	= 4,
 };
 
 #ifdef FIO_INC_DEBUG
diff --git a/io_u.c b/io_u.c
index 404c75b3..b54a79c7 100644
--- 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;
-	static int warned;
 	unsigned int v;
 
 	lastb = last_block(td, f, ddir);
@@ -192,10 +191,8 @@ bail:
 	 * Should never happen
 	 */
 	if (send == -1U) {
-		if (!warned) {
+		if (!fio_did_warn(FIO_WARN_ZONED_BUG))
 			log_err("fio: bug in zoned generation\n");
-			warned = 1;
-		}
 		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;
-	static int warned;
 	struct zone_split_index *zsi;
 
 	lastb = last_block(td, f, ddir);
@@ -248,10 +244,8 @@ bail:
 	 * Should never happen
 	 */
 	if (send == -1U) {
-		if (!warned) {
+		if (!fio_did_warn(FIO_WARN_ZONED_BUG))
 			log_err("fio: bug in zoned generation\n");
-			warned = 1;
-		}
 		goto bail;
 	}