Merge branch 'diskless_invalidate' of https://github.com/sitsofe/fio

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index 9612244faece57e181c63b3c7afad52a03956740..b178450714d18bde73c2d52746393d1499364f7f 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -87,8 +87,13 @@ static unsigned int get_hdr_inc(struct thread_data *td, struct io_u *io_u)
 {
        unsigned int hdr_inc;
 
+       /*
+        * If we use bs_unaligned, buflen can be larger than the verify
+        * interval (which just defaults to the smallest blocksize possible).
+        */
        hdr_inc = io_u->buflen;
-       if (td->o.verify_interval && td->o.verify_interval <= io_u->buflen)
+       if (td->o.verify_interval && td->o.verify_interval <= io_u->buflen &&
+           !td->o.bs_unaligned)
                hdr_inc = td->o.verify_interval;
 
        return hdr_inc;
@@ -1164,7 +1169,7 @@ static void __fill_hdr(struct thread_data *td, struct io_u *io_u,
        hdr->rand_seed = rand_seed;
        hdr->offset = io_u->offset + header_num * td->o.verify_interval;
        hdr->time_sec = io_u->start_time.tv_sec;
-       hdr->time_usec = io_u->start_time.tv_nsec / 1000;
+       hdr->time_nsec = io_u->start_time.tv_nsec;
        hdr->thread = td->thread_number;
        hdr->numberio = io_u->numberio;
        hdr->crc32 = fio_crc32c(p, offsetof(struct verify_header, crc32));
@@ -1175,7 +1180,6 @@ static void fill_hdr(struct thread_data *td, struct io_u *io_u,
                     struct verify_header *hdr, unsigned int header_num,
                     unsigned int header_len, uint64_t rand_seed)
 {
-
        if (td->o.verify != VERIFY_PATTERN_NO_HDR)
                __fill_hdr(td, io_u, hdr, header_num, header_len, rand_seed);
 }