X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=verify.c;h=46e610d713fd221d0e10b7cc74579f5ffb54fc10;hb=38470f85fa4acddab4339db9c8805a19bc87578e;hp=99b21e8fd922e5f0d3124df5d9e6be7b7438d484;hpb=9cc3d1506b9f7ce0a9dba38c32c418e54ea0b573;p=fio.git

diff --git a/verify.c b/verify.c
index 99b21e8f..46e610d7 100644
--- a/verify.c
+++ b/verify.c
@@ -6,7 +6,6 @@
 #include <string.h>
 
 #include "fio.h"
-#include "os.h"
 
 static void fill_random_bytes(struct thread_data *td,
 			      unsigned char *p, unsigned int len)
@@ -150,8 +149,7 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 
 int get_next_verify(struct thread_data *td, struct io_u *io_u)
 {
-	struct io_piece *ipo;
-	struct rb_node *n;
+	struct io_piece *ipo = NULL;
 
 	/*
 	 * this io_u is from a requeue, we already filled the offsets
@@ -159,12 +157,17 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
 	if (io_u->file)
 		return 0;
 
-	n = rb_first(&td->io_hist_tree);
-	if (n) {
-		ipo = rb_entry(n, struct io_piece, rb_node);
+	if (!RB_EMPTY_ROOT(&td->io_hist_tree)) {
+		struct rb_node *n = rb_first(&td->io_hist_tree);
 
+		ipo = rb_entry(n, struct io_piece, rb_node);
 		rb_erase(n, &td->io_hist_tree);
+	} else if (!list_empty(&td->io_hist_list)) {
+		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
+		list_del(&ipo->list);
+	}
 
+	if (ipo) {
 		io_u->offset = ipo->offset;
 		io_u->buflen = ipo->len;
 		io_u->file = ipo->file;