projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix two error paths
[fio.git]
/
verify.c
diff --git
a/verify.c
b/verify.c
index 261570127c5b21cf8cc6797877d997102c58a1cf..e59a4b29051065cd9ebd1caf0ab1b9494f313211 100644
(file)
--- a/
verify.c
+++ b/
verify.c
@@
-847,7
+847,7
@@
int verify_io_u(struct thread_data *td, struct io_u *io_u)
done:
if (ret && td->o.verify_fatal)
done:
if (ret && td->o.verify_fatal)
-
td->terminate = 1
;
+
fio_mark_td_terminate(td)
;
return ret;
}
return ret;
}
@@
-1082,7
+1082,7
@@
int get_next_verify(struct thread_data *td, struct io_u *io_u)
assert(ipo->flags & IP_F_ONRB);
ipo->flags &= ~IP_F_ONRB;
} else if (!flist_empty(&td->io_hist_list)) {
assert(ipo->flags & IP_F_ONRB);
ipo->flags &= ~IP_F_ONRB;
} else if (!flist_empty(&td->io_hist_list)) {
- ipo = flist_
entry(td->io_hist_list.nex
t, struct io_piece, list);
+ ipo = flist_
first_entry(&td->io_hist_lis
t, struct io_piece, list);
/*
* Ensure that the associated IO has completed
/*
* Ensure that the associated IO has completed
@@
-1187,7
+1187,7
@@
static void *verify_async_thread(void *data)
continue;
while (!flist_empty(&list)) {
continue;
while (!flist_empty(&list)) {
- io_u = flist_
entry(list.nex
t, struct io_u, verify_list);
+ io_u = flist_
first_entry(&lis
t, struct io_u, verify_list);
flist_del(&io_u->verify_list);
ret = verify_io_u(td, io_u);
flist_del(&io_u->verify_list);
ret = verify_io_u(td, io_u);
@@
-1205,7
+1205,7
@@
static void *verify_async_thread(void *data)
if (ret) {
td_verror(td, ret, "async_verify");
if (td->o.verify_fatal)
if (ret) {
td_verror(td, ret, "async_verify");
if (td->o.verify_fatal)
-
td->terminate = 1
;
+
fio_mark_td_terminate(td)
;
}
done:
}
done: