Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index f2ef10792a2c53969a894b94cccc3d8788ee9e07..643e782010648bd43c53f827a97eb5437194d177 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -85,7 +85,7 @@ int verify_io_u(struct io_u *io_u)
 
        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 @@ 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);