Revamp the file creation code

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 4ab08ce7472ca806573cf4fcb9875c96645c9b5f..3e8d886ae89c95c155e61608b622fb97af4ac3b5 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -263,21 +263,27 @@ int td_io_commit(struct thread_data *td)
 
 int td_io_open_file(struct thread_data *td, struct fio_file *f)
 {
-       if (td->io_ops->open_file(td, f))
-               return 1;
-
-       f->last_free_lookup = 0;
-       f->last_completed_pos = 0;
-       f->last_pos = 0;
-       f->flags |= FIO_FILE_OPEN;
-       f->flags &= ~FIO_FILE_CLOSING;
+       if (!td->io_ops->open_file(td, f)) {
+               f->last_free_lookup = 0;
+               f->last_completed_pos = 0;
+               f->last_pos = 0;
+               f->flags |= FIO_FILE_OPEN;
+               f->flags &= ~FIO_FILE_CLOSING;
+
+               if (f->file_map)
+                       memset(f->file_map, 0, f->num_maps * sizeof(long));
+
+               td->nr_open_files++;
+               get_file(f);
+               return 0;
+       }
 
-       if (f->file_map)
-               memset(f->file_map, 0, f->num_maps * sizeof(long));
+       if (td->error == EINVAL && td->o.odirect)
+               log_err("fio: destination does not support O_DIRECT\n");
+       if (td->error == EMFILE)
+               log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
 
-       td->nr_open_files++;
-       get_file(f);
-       return 0;
+       return 1;
 }
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)