Revert "Remove verify_pattern option, replace with verify=pattern:x"
This reverts commit bfb41d98f63cb9fb72cb7c82618be10bc6d52c33.
Reverting lets us have verify=meta and specify a verify_pattern at the same
time. Sample surfacescan conf file coming up.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/verify.c b/verify.c
index 59a9dde..3cda326 100644
--- a/verify.c
+++ b/verify.c
@@ -112,7 +112,6 @@
switch (verify_type) {
case VERIFY_NONE:
case VERIFY_NULL:
- case VERIFY_PATTERN:
len = 0;
break;
case VERIFY_MD5:
@@ -406,6 +405,19 @@
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,17 +443,6 @@
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 = EINVAL;
@@ -580,8 +581,6 @@
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);