Fix double io_u free in error path

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 5bf8c43d3f9b0736422cf9fa3bb9973eaeafd81a..51734641d3c59dd83e960a95ee84a94e53e42b30 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -238,7 +238,7 @@ struct fio_file {
                unsigned long file_data;
                int fd;
        };
-       const char *file_name;
+       char *file_name;
        void *mmap;
        unsigned long long file_size;
        unsigned long long real_file_size;
@@ -323,9 +323,10 @@ struct thread_data {
        int groupid;
        struct thread_stat ts;
        struct fio_file *files;
+       unsigned int files_index;
        unsigned int nr_files;
        unsigned int nr_open_files;
-       unsigned int nr_uniq_files;
+       unsigned int nr_normal_files;
        union {
                unsigned int next_file;
                os_random_state_t next_file_state;
@@ -356,6 +357,7 @@ struct thread_data {
        unsigned int write_bw_log;
        unsigned int norandommap;
        unsigned int bs_unaligned;
+       unsigned int fsync_on_close;
 
        unsigned int bs[2];
        unsigned int min_bs[2];
@@ -391,6 +393,7 @@ struct thread_data {
        unsigned int file_service_type;
        unsigned int group_reporting;
        unsigned int open_files;
+       char *opendir;
 
        char *read_iolog_file;
        char *write_iolog_file;
@@ -658,6 +661,7 @@ extern void generic_close_file(struct thread_data *, struct fio_file *);
 extern void add_file(struct thread_data *, const char *);
 extern void get_file(struct fio_file *);
 extern void put_file(struct thread_data *, struct fio_file *);
+extern int add_dir_files(struct thread_data *, const char *);
 
 /*
  * ETA/status stuff
@@ -774,7 +778,7 @@ extern void close_ioengine(struct thread_data *);
 #define for_each_td(td, i)     \
        for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
 #define for_each_file(td, f, i)        \
-       for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->open_files; (i)++, (f)++)
+       for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->nr_files; (i)++, (f)++)
 
 #define fio_assert(td, cond)   do {    \
        if (!(cond)) {                  \