Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index 871a36de0ccaf71f9649fef5887ab3ce314f6a72..10bad7e2bab5f65c8b9168333a5f2567e40d19e1 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -478,6 +478,12 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                                                  p + hdr_size,
                                                  hdr_inc - hdr_size,
                                                  hdr_size % 4);
+                       /*
+                        * Also verify the meta data, if applicable
+                        */
+                       if (hdr->verify_type == VERIFY_META)
+                               ret |= verify_io_u_meta(hdr, td, io_u, hdr_num);
+
                        if (ret)
                                log_err("fio: verify failed at %llu/%u\n",
                                        io_u->offset + hdr_num * hdr->len,
@@ -766,7 +772,8 @@ static void *verify_async_thread(void *data)
 
                while (flist_empty(&td->verify_list) &&
                       !td->verify_thread_exit) {
-                       ret = pthread_cond_wait(&td->verify_cond, &td->io_u_lock);
+                       ret = pthread_cond_wait(&td->verify_cond,
+                                                       &td->io_u_lock);
                        if (ret) {
                                pthread_mutex_unlock(&td->io_u_lock);
                                break;
@@ -835,6 +842,7 @@ int verify_async_init(struct thread_data *td)
        }
 
        if (i != td->o.verify_async) {
+               log_err("fio: only %d verify threads started, exiting\n", i);
                td->verify_thread_exit = 1;
                write_barrier();
                pthread_cond_broadcast(&td->verify_cond);