From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 6 Dec 2021 20:26:52 +0000 (-0700)
Subject: Merge branch 'arm-detect-pmull' of https://github.com/sitsofe/fio
X-Git-Tag: fio-3.29~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fab60fa78a1832c17f8bb200292ded4a8b3eb2a5;hp=3721c7fe276dbbc93e584359f87913e58f96626e;p=fio.git

Merge branch 'arm-detect-pmull' of https://github.com/sitsofe/fio

* 'arm-detect-pmull' of https://github.com/sitsofe/fio:
  os: detect PMULL support before enabling accelerated crc32c on ARM
---

diff --git a/io_ddir.h b/io_ddir.h
index a42da97a..296a9d04 100644
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -24,7 +24,7 @@ static inline const char *io_ddir_name(enum fio_ddir ddir)
 					"datasync", "sync_file_range",
 					"wait", };
 
-	if (ddir < DDIR_LAST)
+	if (ddir >= 0 && ddir < DDIR_LAST)
 		return name[ddir];
 
 	return "invalid";
diff --git a/libfio.c b/libfio.c
index ed5906d4..198eaf2e 100644
--- a/libfio.c
+++ b/libfio.c
@@ -140,7 +140,6 @@ void reset_all_stats(struct thread_data *td)
 		td->io_issues[i] = 0;
 		td->ts.total_io_u[i] = 0;
 		td->ts.runtime[i] = 0;
-		td->rwmix_issues = 0;
 	}
 
 	set_epoch_time(td, td->o.log_unix_epoch);