projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zbd: fix various 32-bit compilation warnings
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index e5fbcd432ce78fb847148383ad03016966aab88d..ba02952b1f0f8d0c8ae9bebe31e091a0302046aa 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-18,6
+18,7
@@
#include "fio.h"
#include "diskutil.h"
#include "fio.h"
#include "diskutil.h"
+#include "zbd.h"
static FLIST_HEAD(engine_list);
static FLIST_HEAD(engine_list);
@@
-319,6
+320,10
@@
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
}
ret = td->io_ops->queue(td, io_u);
}
ret = td->io_ops->queue(td, io_u);
+ if (ret != FIO_Q_BUSY && io_u->post_submit) {
+ io_u->post_submit(io_u, io_u->error == 0);
+ io_u->post_submit = NULL;
+ }
unlock_file(td, io_u->file);
unlock_file(td, io_u->file);
@@
-350,6
+355,13
@@
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
"invalid block size. Try setting direct=0.\n");
}
"invalid block size. Try setting direct=0.\n");
}
+ if (zbd_unaligned_write(io_u->error) &&
+ td->io_issues[io_u->ddir & 1] == 1 &&
+ td->o.zone_mode != ZONE_MODE_ZBD) {
+ log_info("fio: first I/O failed. If %s is a zoned block device, consider --zonemode=zbd\n",
+ io_u->file->file_name);
+ }
+
if (!td->io_ops->commit) {
io_u_mark_submit(td, 1);
io_u_mark_complete(td, 1);
if (!td->io_ops->commit) {
io_u_mark_submit(td, 1);
io_u_mark_complete(td, 1);
@@
-431,6
+443,14
@@
void td_io_commit(struct thread_data *td)
int td_io_open_file(struct thread_data *td, struct fio_file *f)
{
int td_io_open_file(struct thread_data *td, struct fio_file *f)
{
+ if (fio_file_closing(f)) {
+ /*
+ * Open translates to undo closing.
+ */
+ fio_file_clear_closing(f);
+ get_file(f);
+ return 0;
+ }
assert(!fio_file_open(f));
assert(f->fd == -1);
assert(td->io_ops->open_file);
assert(!fio_file_open(f));
assert(f->fd == -1);
assert(td->io_ops->open_file);
@@
-540,11
+560,6
@@
int td_io_close_file(struct thread_data *td, struct fio_file *f)
*/
fio_file_set_closing(f);
*/
fio_file_set_closing(f);
- disk_util_dec(f->du);
-
- if (td->o.file_lock_mode != FILE_LOCK_NONE)
- unlock_file_all(td, f);
-
return put_file(td, f);
}
return put_file(td, f);
}