diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-09-13 14:56:16 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-09-13 14:56:16 -0600 |
| commit | ae3ae8367271e6df7be5eae37c15c00e6c2dc76e (patch) | |
| tree | 59d7720d94a5af674dc5f46f9e7f2dafd56d330d | |
| parent | 4c29a34fcc8cae333ec8b7af7657495745153b44 (diff) | |
| parent | 34d6090ea96ddaa4e2a0f914939e2b8ff7008bec (diff) | |
| download | fio-ae3ae8367271e6df7be5eae37c15c00e6c2dc76e.tar.gz fio-ae3ae8367271e6df7be5eae37c15c00e6c2dc76e.tar.bz2 | |
Merge branch 'fio_reset_sqe' of https://github.com/anarazel/fio
* 'fio_reset_sqe' of https://github.com/anarazel/fio:
engines/io_uring: Fully clear out previous SQE contents.
| -rw-r--r-- | engines/io_uring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/io_uring.c b/engines/io_uring.c index 53cb60c5..e5edfcd2 100644 --- a/engines/io_uring.c +++ b/engines/io_uring.c @@ -152,15 +152,16 @@ static int fio_ioring_prep(struct thread_data *td, struct io_u *io_u) struct io_uring_sqe *sqe; sqe = &ld->sqes[io_u->index]; + + /* zero out fields not used in this submission */ + memset(sqe, 0, sizeof(*sqe)); + if (o->registerfiles) { sqe->fd = f->engine_pos; sqe->flags = IOSQE_FIXED_FILE; } else { sqe->fd = f->fd; - sqe->flags = 0; } - sqe->ioprio = 0; - sqe->buf_index = 0; if (io_u->ddir == DDIR_READ || io_u->ddir == DDIR_WRITE) { if (o->fixedbufs) { @@ -187,7 +188,6 @@ static int fio_ioring_prep(struct thread_data *td, struct io_u *io_u) sqe->sync_range_flags = td->o.sync_file_range; sqe->opcode = IORING_OP_SYNC_FILE_RANGE; } else { - sqe->fsync_flags = 0; if (io_u->ddir == DDIR_DATASYNC) sqe->fsync_flags |= IORING_FSYNC_DATASYNC; sqe->opcode = IORING_OP_FSYNC; |