X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=95e06dd8e045136ce9954a8e759aef3dac09a7d0;hp=e4fec4f6e0202a041dfd4524f45570a0bdd074de;hb=b2fdda43cf0699f60e711429c778ff1685e30062;hpb=079ad09b1ef22fa0d47c2cd2673908c5619aa41a

diff --git a/fio.c b/fio.c
index e4fec4f6..95e06dd8 100644
--- a/fio.c
+++ b/fio.c
@@ -149,7 +149,9 @@ static void cleanup_pending_aio(struct thread_data *td)
 	/*
 	 * get immediately available events, if any
 	 */
-	io_u_queued_complete(td, 0, NULL);
+	r = io_u_queued_complete(td, 0, NULL);
+	if (r < 0)
+		return;
 
 	/*
 	 * now cancel remaining active events
@@ -165,7 +167,7 @@ static void cleanup_pending_aio(struct thread_data *td)
 	}
 
 	if (td->cur_depth)
-		io_u_queued_complete(td, td->cur_depth, NULL);
+		r = io_u_queued_complete(td, td->cur_depth, NULL);
 }
 
 /*
@@ -203,7 +205,8 @@ requeue:
 			return 1;
 		}
 
-		io_u_sync_complete(td, io_u, NULL);
+		if (io_u_sync_complete(td, io_u, NULL) < 0)
+			return 1;
 	} else if (ret == FIO_Q_BUSY) {
 		if (td_io_commit(td))
 			return 1;
@@ -228,10 +231,15 @@ static void do_verify(struct thread_data *td)
 	 * read from disk.
 	 */
 	for_each_file(td, f, i) {
-		fio_io_sync(td, f);
-		file_invalidate_cache(td, f);
+		if (fio_io_sync(td, f))
+			break;
+		if (file_invalidate_cache(td, f))
+			break;
 	}
 
+	if (td->error)
+		return;
+
 	td_set_runstate(td, TD_VERIFYING);
 
 	io_u = NULL;
@@ -287,9 +295,13 @@ requeue:
 		 * completed io_u's first.
 		 */
 		min_events = 0;
-		if (queue_full(td) || ret == FIO_Q_BUSY)
+		if (queue_full(td) || ret == FIO_Q_BUSY) {
 			min_events = 1;
 
+			if (td->cur_depth > td->iodepth_low)
+				min_events = td->cur_depth - td->iodepth_low;
+		}
+
 		/*
 		 * Reap required number of io units, if any, and do the
 		 * verification on them through the callback handler
@@ -411,9 +423,13 @@ requeue:
 		 */
 		if (ret == FIO_Q_QUEUED || ret == FIO_Q_BUSY) {
 			min_evts = 0;
-			if (queue_full(td) || ret == FIO_Q_BUSY)
+			if (queue_full(td) || ret == FIO_Q_BUSY) {
 				min_evts = 1;
 
+				if (td->cur_depth > td->iodepth_low)
+					min_evts = td->cur_depth - td->iodepth_low;
+			}
+
 			fio_gettime(&comp_time, NULL);
 			bytes_done = io_u_queued_complete(td, min_evts, NULL);
 			if (bytes_done < 0)