Merge branch 'master' into gfio

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index a0ac424cf6082e1f8f6d9573b3fcda8eddf9aaae..3600319b233fb923fd214bea4179d436ae0f0f0e 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -337,19 +337,19 @@ static int break_on_this_error(struct thread_data *td, enum fio_ddir ddir,
        int ret = *retptr;
 
        if (ret < 0 || td->error) {
-               int err;
+               int err = td->error;
+               enum error_type_bit eb;
 
                if (ret < 0)
                        err = -ret;
-               else
-                       err = td->error;
 
-               if (!(td->o.continue_on_error & td_error_type(ddir, err)))
+               eb = td_error_type(ddir, err);
+               if (!(td->o.continue_on_error & (1 << eb)))
                        return 1;
 
-               if (td_non_fatal_error(err)) {
-                       /*
-                        * Continue with the I/Os in case of
+               if (td_non_fatal_error(td, eb, err)) {
+                       /*
+                        * Continue with the I/Os in case of
                         * a non fatal error.
                         */
                        update_error_count(td, err);