projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sgunmap2' of https://github.com/vincentkfu/fio
[fio.git]
/
verify.c
diff --git
a/verify.c
b/verify.c
index c5fa24110143cb46cee4a6dad1db9a7e878c6a01..01492f24f9a0336c3b09ebb295aa0afe6963c4bd 100644
(file)
--- a/
verify.c
+++ b/
verify.c
@@
-801,7
+801,7
@@
static int verify_trimmed_io_u(struct thread_data *td, struct io_u *io_u)
mem_is_zero_slow(io_u->buf, io_u->buflen, &offset);
mem_is_zero_slow(io_u->buf, io_u->buflen, &offset);
- log_err("trim: verify failed at file %s offset %llu, length %lu"
+ log_err("trim: verify failed at file %s offset %llu, length %l
l
u"
", block offset %lu\n",
io_u->file->file_name, io_u->offset, io_u->buflen,
(unsigned long) offset);
", block offset %lu\n",
io_u->file->file_name, io_u->offset, io_u->buflen,
(unsigned long) offset);
@@
-919,10
+919,9
@@
int verify_io_u(struct thread_data *td, struct io_u **io_u_ptr)
hdr = p;
/*
hdr = p;
/*
- * Make rand_seed check pass when have verifysort or
- * verify_backlog.
+ * Make rand_seed check pass when have verify_backlog.
*/
*/
- if (
td->o.verifysort
|| (td->flags & TD_F_VER_BACKLOG))
+ if (
!td_rw(td)
|| (td->flags & TD_F_VER_BACKLOG))
io_u->rand_seed = hdr->rand_seed;
if (td->o.verify != VERIFY_PATTERN_NO_HDR) {
io_u->rand_seed = hdr->rand_seed;
if (td->o.verify != VERIFY_PATTERN_NO_HDR) {
@@
-1518,7
+1517,7
@@
int paste_blockoff(char *buf, unsigned int len, void *priv)
struct io_u *io = priv;
unsigned long long off;
struct io_u *io = priv;
unsigned long long off;
- typecheck(
typeof
(off), io->offset);
+ typecheck(
__typeof__
(off), io->offset);
off = cpu_to_le64((uint64_t)io->offset);
len = min(len, (unsigned int)sizeof(off));
memcpy(buf, &off, len);
off = cpu_to_le64((uint64_t)io->offset);
len = min(len, (unsigned int)sizeof(off));
memcpy(buf, &off, len);