genfio: Splitting gen_template in 2 parts

[fio.git] / file.h

diff --git a/file.h b/file.h
index 5f125c3b5924e8f95b55be9cde1a00c7786fb13c..d7e05f4fb22e0aaf97b5cb0c7453f1ce4cdc1051 100644 (file)
--- a/file.h
+++ b/file.h
@@ -97,15 +97,15 @@ struct fio_file {
        /*
         * For use by the io engine
         */
-       uintptr_t engine_data;
+       uint64_t engine_data;
 
        /*
         * if io is protected by a semaphore, this is set
         */
-       struct fio_mutex *lock;
-       void *lock_owner;
-       unsigned int lock_batch;
-       enum fio_ddir lock_ddir;
+       union {
+               struct fio_mutex *lock;
+               struct fio_rwlock *rwlock;
+       };
 
        /*
         * block map for random io
@@ -175,13 +175,6 @@ extern int init_random_map(struct thread_data *);
 extern void dup_files(struct thread_data *, struct thread_data *);
 extern int get_fileno(struct thread_data *, const char *);
 extern void free_release_files(struct thread_data *);
-
-static inline void fio_file_reset(struct fio_file *f)
-{
-       f->last_pos = f->file_offset;
-       f->last_start = -1ULL;
-       if (f->io_axmap)
-               axmap_reset(f->io_axmap);
-}
+void fio_file_reset(struct thread_data *, struct fio_file *);
 
 #endif