X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=643e782010648bd43c53f827a97eb5437194d177;hp=32cfdd7a24859df70ca5192dbe7397c02075ba65;hb=a7dfe862c2e3fe72b8db6a6e67302048d3731c6d;hpb=36167d82e5f49dee91c6d2cd426068edee90e36f

diff --git a/verify.c b/verify.c
index 32cfdd7a..643e7820 100644
--- a/verify.c
+++ b/verify.c
@@ -78,14 +78,14 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u)
 	return 0;
 }
 
-static int verify_io_u(struct io_u *io_u)
+int verify_io_u(struct io_u *io_u)
 {
 	struct verify_header *hdr = (struct verify_header *) io_u->buf;
 	int ret;
 
 	if (hdr->fio_magic != FIO_HDR_MAGIC) {
 		log_err("Bad verify header %x\n", hdr->fio_magic);
-		return 1;
+		return EIO;
 	}
 
 	if (hdr->verify_type == VERIFY_MD5)
@@ -97,7 +97,10 @@ static int verify_io_u(struct io_u *io_u)
 		ret = 1;
 	}
 
-	return ret;
+	if (ret)
+		return EIO;
+
+	return 0;
 }
 
 static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
@@ -143,6 +146,12 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
 {
 	struct io_piece *ipo;
 
+	/*
+	 * this io_u is from a requeue, we already filled the offsets
+	 */
+	if (io_u->file)
+		return 0;
+
 	if (!list_empty(&td->io_hist_list)) {
 		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
 
@@ -160,21 +169,3 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
 
 	return 1;
 }
-
-int do_io_u_verify(struct thread_data *td, struct io_u **io_u)
-{
-	struct io_u *v_io_u = *io_u;
-	int ret = 0;
-
-	if (v_io_u) {
-		struct io_completion_data icd;
-
-		ret = verify_io_u(v_io_u);
-		init_icd(&icd);
-		io_completed(td, v_io_u, &icd);
-		put_io_u(td, v_io_u);
-		*io_u = NULL;
-	}
-
-	return ret;
-}