From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 18 Jun 2010 12:48:43 +0000 (+0200)
Subject: Verify fatal fixups
X-Git-Tag: fio-1.41~1
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=f3e6cb95fecf867ec46e3dfd59ef1a1db1b6ad2a

Verify fatal fixups

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/verify.c b/verify.c
index a1479d12..6b54b70f 100644
--- a/verify.c
+++ b/verify.c
@@ -503,10 +503,9 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 			.hdr_num	= hdr_num,
 		};
 
-		if (ret && td->o.verify_fatal) {
-			td->terminate = 1;
+		if (ret && td->o.verify_fatal)
 			break;
-		}
+
 		hdr_size = __hdr_size(td->o.verify);
 		if (td->o.verify_offset)
 			memswp(p, p + td->o.verify_offset, hdr_size);
@@ -582,6 +581,9 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 		}
 	}
 
+	if (ret && td->o.verify_fatal)
+		td->terminate = 1;
+
 	return ret;
 }
 
@@ -879,7 +881,8 @@ static void *verify_async_thread(void *data)
 
 	if (ret) {
 		td_verror(td, ret, "async_verify");
-		td->terminate = 1;
+		if (td->o.verify_fatal)
+			td->terminate = 1;
 	}
 
 done: