X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=a9441b4179615c83c43056e134a1c92b10c180b8;hp=f2ef10792a2c53969a894b94cccc3d8788ee9e07;hb=d3aad8f28b9e214fccfce5e3a406dec723f57a62;hpb=3af6ef399a9df324ffe4a8c8e03b52a42f587229 diff --git a/verify.c b/verify.c index f2ef1079..a9441b41 100644 --- a/verify.c +++ b/verify.c @@ -38,8 +38,8 @@ static void hexdump(void *buffer, int len) int i; for (i = 0; i < len; i++) - fprintf(f_out, "%02x", p[i]); - fprintf(f_out, "\n"); + log_info("%02x", p[i]); + log_info("\n"); } static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u) @@ -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);