Error reporting fixups for meta/pattern verifies

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

diff --git a/verify.c b/verify.c
index bb0aba77f96400f66e7729a202773a905c944d2c..a1479d12110beaf0ba2bb8840e54c166b98e096c 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -513,9 +513,10 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                hdr = p;
 
                if (hdr->fio_magic != FIO_HDR_MAGIC) {
-                       log_err("Bad verify header %x at %llu\n",
-                                       hdr->fio_magic,
-                                       io_u->offset + hdr_num * hdr->len);
+                       log_err("verify: bad magic header %x, wanted %x at file %s offset %llu, length %u\n",
+                               hdr->fio_magic, FIO_HDR_MAGIC,
+                               io_u->file->file_name,
+                               io_u->offset + hdr_num * hdr->len, hdr->len);
                        return EILSEQ;
                }
 
@@ -527,16 +528,19 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                                  p + hdr_size,
                                  hdr_inc - hdr_size,
                                  hdr_size % td->o.verify_pattern_bytes);
+
+                       if (ret) {
+                               log_err("pattern: verify failed at file %s offset %llu, length %u\n",
+                                       io_u->file->file_name,
+                                       io_u->offset + hdr_num * hdr->len,
+                                       hdr->len);
+                       }
+
                        /*
                         * Also verify the meta data, if applicable
                         */
                        if (hdr->verify_type == VERIFY_META)
                                ret |= verify_io_u_meta(hdr, td, &vc);
-
-                       if (ret)
-                               log_err("fio: verify failed at %llu/%u\n",
-                                       io_u->offset + hdr_num * hdr->len,
-                                       hdr->len);
                        continue;
                }