No need to fill random bytes for VERIFY_NULL

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index f748065d7fc031b66098334aef419654b5ff25c9..99b21e8fd922e5f0d3124df5d9e6be7b7438d484 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -78,11 +78,14 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u)
        return 0;
 }
 
-int verify_io_u(struct io_u *io_u)
+int verify_io_u(struct thread_data *td, struct io_u *io_u)
 {
        struct verify_header *hdr = (struct verify_header *) io_u->buf;
        int ret;
 
+       if (td->o.verify == VERIFY_NULL)
+               return 0;
+
        if (hdr->fio_magic != FIO_HDR_MAGIC) {
                log_err("Bad verify header %x\n", hdr->fio_magic);
                return EIO;
@@ -126,6 +129,9 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
        unsigned char *p = (unsigned char *) io_u->buf;
        struct verify_header hdr;
 
+       if (td->o.verify == VERIFY_NULL)
+               return;
+
        hdr.fio_magic = FIO_HDR_MAGIC;
        hdr.len = io_u->buflen;
        p += sizeof(hdr);
@@ -134,7 +140,7 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
        if (td->o.verify == VERIFY_MD5) {
                fill_md5(&hdr, p, io_u->buflen - sizeof(hdr));
                hdr.verify_type = VERIFY_MD5;
-       } else {
+       } else if (td->o.verify == VERIFY_CRC32) {
                fill_crc32(&hdr, p, io_u->buflen - sizeof(hdr));
                hdr.verify_type = VERIFY_CRC32;
        }
@@ -145,6 +151,7 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 int get_next_verify(struct thread_data *td, struct io_u *io_u)
 {
        struct io_piece *ipo;
+       struct rb_node *n;
 
        /*
         * this io_u is from a requeue, we already filled the offsets
@@ -152,10 +159,11 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
        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);
+       n = rb_first(&td->io_hist_tree);
+       if (n) {
+               ipo = rb_entry(n, struct io_piece, rb_node);
 
-               list_del(&ipo->list);
+               rb_erase(n, &td->io_hist_tree);
 
                io_u->offset = ipo->offset;
                io_u->buflen = ipo->len;