projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add return statements to arch_init functions for ia64 and ppc.
[fio.git]
/
verify.c
diff --git
a/verify.c
b/verify.c
index f246dc8f9ba0cfe3f4a9e2b43316f398b75cb4b1..c0485d55bf268563a5bc760bede3333f7a58e8e6 100644
(file)
--- a/
verify.c
+++ b/
verify.c
@@
-690,6
+690,7
@@
int verify_io_u(struct thread_data *td, struct io_u *io_u)
.hdr_num = hdr_num,
.td = td,
};
.hdr_num = hdr_num,
.td = td,
};
+ unsigned int verify_type;
if (ret && td->o.verify_fatal)
break;
if (ret && td->o.verify_fatal)
break;
@@
-708,7
+709,12
@@
int verify_io_u(struct thread_data *td, struct io_u *io_u)
return EILSEQ;
}
return EILSEQ;
}
- switch (hdr->verify_type) {
+ if (td->o.verify != VERIFY_NONE)
+ verify_type = td->o.verify;
+ else
+ verify_type = hdr->verify_type;
+
+ switch (verify_type) {
case VERIFY_MD5:
ret = verify_io_u_md5(hdr, &vc);
break;
case VERIFY_MD5:
ret = verify_io_u_md5(hdr, &vc);
break;
@@
-747,6
+753,10
@@
int verify_io_u(struct thread_data *td, struct io_u *io_u)
log_err("Bad verify type %u\n", hdr->verify_type);
ret = EINVAL;
}
log_err("Bad verify type %u\n", hdr->verify_type);
ret = EINVAL;
}
+
+ if (ret && verify_type != hdr->verify_type)
+ log_err("fio: verify type mismatch (%u media, %u given)\n",
+ hdr->verify_type, verify_type);
}
done:
}
done: