Skip to content

Sync for file operations #2018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −13
Open

Sync for file operations #2018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions engines/falloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,18 @@ static enum fio_q_status fio_fallocate_queue(struct thread_data *td,

fio_ro_check(td, io_u);

if (io_u->ddir == DDIR_READ)
flags = FALLOC_FL_KEEP_SIZE;
else if (io_u->ddir == DDIR_WRITE)
flags = 0;
else if (io_u->ddir == DDIR_TRIM)
flags = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE;

ret = fallocate(f->fd, flags, io_u->offset, io_u->xfer_buflen);
if (io_u->ddir != DDIR_SYNC) {
if (io_u->ddir == DDIR_READ)
flags = FALLOC_FL_KEEP_SIZE;
else if (io_u->ddir == DDIR_WRITE)
flags = 0;
else if (io_u->ddir == DDIR_TRIM)
flags = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE;

ret = fallocate(f->fd, flags, io_u->offset, io_u->xfer_buflen);
} else {
ret = do_io_u_sync(td, io_u);
}

if (ret)
io_u->error = errno;
Expand Down
2 changes: 2 additions & 0 deletions engines/fileoperations.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ static int invalidate_do_nothing(struct thread_data *td, struct fio_file *f)

static enum fio_q_status queue_io(struct thread_data *td, struct io_u *io_u)
{
if (io_u->ddir == DDIR_SYNC && do_io_u_sync(td, io_u))
io_u->error = errno;
return FIO_Q_COMPLETED;
}

Expand Down
11 changes: 6 additions & 5 deletions engines/ftruncate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ static enum fio_q_status fio_ftruncate_queue(struct thread_data *td,
struct io_u *io_u)
{
struct fio_file *f = io_u->file;
int ret;
int ret = 0;

fio_ro_check(td, io_u);

if (io_u->ddir != DDIR_WRITE) {
if (io_u->ddir == DDIR_WRITE)
ret = ftruncate(f->fd, io_u->offset);
else if (io_u->ddir == DDIR_SYNC)
ret = do_io_u_sync(td, io_u);
else
io_u->error = EINVAL;
return FIO_Q_COMPLETED;
}

ret = ftruncate(f->fd, io_u->offset);
if (ret)
io_u->error = errno;

Expand Down