X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=file.h;h=19413fc8fa777d96b419e62c2c9d0c8433b4c2b2;hp=5f125c3b5924e8f95b55be9cde1a00c7786fb13c;hb=002fe73409d1e;hpb=92a0daf8163eaa8d117d1e6e4fdc11a8dddac2d2

diff --git a/file.h b/file.h
index 5f125c3b..19413fc8 100644
--- 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,7 @@ 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 *);
+int fio_files_done(struct thread_data *);
 
 #endif