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 e1da2c9ed530998d1bc1edea81aec28a9c4d10a4..bb2606286650141fbc6de0b2725855a3b09e995f 100644 (file)
--- 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 477b19a437613fda8037b09a77ab705ab25eea5d..7c059d10ff65c34b2371f3f4fd0e5f634e8d2b75 100644 (file)
--- 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 ec87debaf61580cbff89c7049d53e1009a085c2d..e1af59ed57dbb981dc9fbd1f3e9a69cb1275b7b3 100644 (file)
--- 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));
        }
 }