Fix issue with openfiles= and file sizing

[fio.git] / file.h

diff --git a/file.h b/file.h
index 95ecefe7d4f5ec1abece4a862f8784caad4fe781..19413fc8fa777d96b419e62c2c9d0c8433b4c2b2 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
@@ -176,5 +176,6 @@ 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 *);
 void fio_file_reset(struct thread_data *, struct fio_file *);
+int fio_files_done(struct thread_data *);
 
 #endif