Typo in 'init' debug option mask

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index 2acd216dec10a91f12b15f78d5f8257a90098194..3cda3267c9f7262f88aa59f71dfb33614d0fcdf6 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -81,7 +81,7 @@ static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
        }
 }
 
-static void memswp(void* buf1, void* buf2, unsigned int len)
+static void memswp(void *buf1, void *buf2, unsigned int len)
 {
        char swap[200];
 
@@ -112,7 +112,6 @@ static inline unsigned int __hdr_size(int verify_type)
        switch (verify_type) {
        case VERIFY_NONE:
        case VERIFY_NULL:
-       case VERIFY_PATTERN:
                len = 0;
                break;
        case VERIFY_MD5:
@@ -178,7 +177,7 @@ static int verify_io_u_meta(struct verify_header *hdr, struct thread_data *td,
                log_err("meta: verify failed at %llu/%u\n",
                              io_u->offset + header_num * hdr->len,
                              hdr->len);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -203,7 +202,7 @@ static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
                              hdr->len);
                hexdump(vh->sha512, sizeof(vh->sha512));
                hexdump(sha512_ctx.buf, sizeof(sha512));
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -228,7 +227,7 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
                              hdr->len);
                hexdump(vh->sha256, sizeof(vh->sha256));
                hexdump(sha256_ctx.buf, sizeof(sha256));
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -248,7 +247,7 @@ static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
                log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -268,7 +267,7 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
                log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -288,7 +287,7 @@ static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
                log_err("crc64: wanted %llx, got %llx\n", (unsigned long long) vh->crc64, c);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -308,7 +307,7 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
                log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -333,7 +332,7 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
                              hdr->len);
                hexdump(vh->md5_digest, sizeof(vh->md5_digest));
                hexdump(md5_ctx.hash, sizeof(hash));
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -348,7 +347,7 @@ static unsigned int hweight8(unsigned int w)
 }
 
 int verify_io_u_pattern(unsigned long pattern, unsigned long pattern_size,
-                        char* buf, unsigned int len, unsigned int mod)
+                        char *buf, unsigned int len, unsigned int mod)
 {
        unsigned int i;
        char split_pattern[4];
@@ -366,7 +365,7 @@ int verify_io_u_pattern(unsigned long pattern, unsigned long pattern_size,
                        log_err("fio: got pattern %x, wanted %x. Bad bits %d\n",
                                buf[i], split_pattern[mod], bits);
                        log_err("fio: bad pattern block offset %u\n", i);
-                       return 1;
+                       return EIO;
                }
                mod++;
                if (mod == pattern_size)
@@ -406,6 +405,19 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                        return EIO;
                }
 
+               if (td->o.verify_pattern_bytes) {
+                       ret = verify_io_u_pattern(td->o.verify_pattern,
+                                                 td->o.verify_pattern_bytes,
+                                                 p + hdr_size,
+                                                 hdr_inc - hdr_size,
+                                                 hdr_size % 4);
+                       if (ret)
+                               log_err("fio: verify failed at %llu/%u\n",
+                                       io_u->offset + hdr_num * hdr->len,
+                                       hdr->len);
+                       continue;
+               }
+
                switch (hdr->verify_type) {
                case VERIFY_MD5:
                        ret = verify_io_u_md5(hdr, io_u, hdr_num);
@@ -431,20 +443,9 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                case VERIFY_META:
                        ret = verify_io_u_meta(hdr, td, io_u, hdr_num);
                        break;
-               case VERIFY_PATTERN:
-                       ret = verify_io_u_pattern(td->o.verify_pattern,
-                                                 td->o.verify_pattern_bytes,
-                                                 p + hdr_size,
-                                                 hdr_inc - hdr_size,
-                                                 hdr_size % 4);
-                       if (ret)
-                               log_err("fio: verify failed at %llu/%u\n",
-                                       io_u->offset + hdr_num * hdr->len,
-                                       hdr->len);
-                       break;
                default:
                        log_err("Bad verify type %u\n", hdr->verify_type);
-                       ret = 1;
+                       ret = EINVAL;
                }
        }
 
@@ -580,8 +581,6 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
                case VERIFY_META:
                        fill_meta(hdr, td, io_u, header_num);
                        break;
-               case VERIFY_PATTERN:
-                       break;
                default:
                        log_err("fio: bad verify type: %d\n", td->o.verify);
                        assert(0);