Merge branch 'update-fio-ioops-version' of https://github.com/diameter/fio

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index e44f31c716a63eb12440da37fd50d3552db39e10..42c5f630755d22c64aab67f75ef00e1681741fb6 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -231,13 +231,12 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                                                break;
                                        log_info("fio: ENOSPC on laying out "
                                                 "file, stopping\n");
-                                       break;
                                }
                                td_verror(td, errno, "write");
                        } else
                                td_verror(td, EIO, "write");
 
-                       break;
+                       goto err;
                }
        }
 
@@ -655,8 +654,7 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
                }
                flags |= OS_O_DIRECT | FIO_O_ATOMIC;
        }
-       if (td->o.sync_io)
-               flags |= O_SYNC;
+       flags |= td->o.sync_io;
        if (td->o.create_on_open && td->o.allow_create)
                flags |= O_CREAT;
 skip_flags: