projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix_iouring_eintr' of https://github.com/anarazel/fio
[fio.git]
/
engines
/
io_uring.c
diff --git
a/engines/io_uring.c
b/engines/io_uring.c
index a1b1324b8e65fdbc0ecbe1ad80b692d17e7c60c0..8c4bcc57f414582419bad9986a29143b2d686785 100644
(file)
--- a/
engines/io_uring.c
+++ b/
engines/io_uring.c
@@
-555,6
+555,7
@@
static int fio_ioring_post_init(struct thread_data *td)
return 1;
}
return 1;
}
+ printf("files=%d\n", o->registerfiles);
if (o->registerfiles) {
err = fio_ioring_register_files(td);
if (err) {
if (o->registerfiles) {
err = fio_ioring_register_files(td);
if (err) {
@@
-613,7
+614,7
@@
static int fio_ioring_open_file(struct thread_data *td, struct fio_file *f)
struct ioring_data *ld = td->io_ops_data;
struct ioring_options *o = td->eo;
struct ioring_data *ld = td->io_ops_data;
struct ioring_options *o = td->eo;
- if (!o->registerfiles)
+ if (!
ld || !
o->registerfiles)
return generic_open_file(td, f);
f->fd = ld->fds[f->engine_pos];
return generic_open_file(td, f);
f->fd = ld->fds[f->engine_pos];
@@
-622,9
+623,10
@@
static int fio_ioring_open_file(struct thread_data *td, struct fio_file *f)
static int fio_ioring_close_file(struct thread_data *td, struct fio_file *f)
{
static int fio_ioring_close_file(struct thread_data *td, struct fio_file *f)
{
+ struct ioring_data *ld = td->io_ops_data;
struct ioring_options *o = td->eo;
struct ioring_options *o = td->eo;
- if (!o->registerfiles)
+ if (!
ld || !
o->registerfiles)
return generic_close_file(td, f);
f->fd = -1;
return generic_close_file(td, f);
f->fd = -1;