From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 15 Jun 2009 10:37:30 +0000 (+0200)
Subject: Fix typo on continue_on_error patch
X-Git-Tag: fio-1.29-rc1~14
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1ec99eea970609e63f49982f0d052a23ac18848d;p=fio.git

Fix typo on continue_on_error patch

Also expand the error print a bit.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/fio.c b/fio.c
index e1da2c9e..bb260628 100644
--- a/fio.c
+++ b/fio.c
@@ -379,8 +379,8 @@ static int break_on_this_error(struct thread_data *td, int *retptr)
 	if (ret < 0 || td->error) {
 		int err;
 
-		if (!td->o.continue_on_error);
-			return 0;
+		if (!td->o.continue_on_error)
+			return 1;
 
 		if (ret < 0)
 			err = -ret;
diff --git a/fio.h b/fio.h
index 477b19a4..7c059d10 100644
--- a/fio.h
+++ b/fio.h
@@ -446,7 +446,7 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
 
 #define MAX_JOBS	(1024)
 
-#define td_non_fatal_error(e)	((e) == -EIO || (e) == EILSEQ)
+#define td_non_fatal_error(e)	((e) == EIO || (e) == EILSEQ)
 
 static inline void update_error_count(struct thread_data *td, int err)
 {
diff --git a/stat.c b/stat.c
index ec87deba..e1af59ed 100644
--- a/stat.c
+++ b/stat.c
@@ -336,8 +336,10 @@ static void show_thread_status(struct thread_stat *ts,
 	stat_calc_lat_m(ts, io_u_lat_m);
 	show_latencies(io_u_lat_u, io_u_lat_m);
 	if (ts->continue_on_error) {
-		log_info("     errors: total=%lu, first_error=%d\n",
-					ts->total_err_count, ts->first_error);
+		log_info("     errors    : total=%lu, first_error=%d/<%s>\n",
+					ts->total_err_count,
+					ts->first_error,
+					strerror(ts->first_error));
 	}
 }