Rate must always calculate bytes done

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index 32cfdd7a24859df70ca5192dbe7397c02075ba65..6cbd0add35d2683186771a20f8b3079cb8079f5b 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -78,7 +78,7 @@ 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;
@@ -143,6 +143,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 +166,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;
-}