X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=file.h;h=e57bebcffff605c4c5996b88287cb40ff9c9254d;hb=1d69e8acd7d338822bfe9630e7cdceee159c7bd2;hp=ce92ff75305dda0438ec041dcfa7f37c6fb5ce83;hpb=51ede0b1e9c9b570b942b50b44d0455183a0d5ec;p=fio.git

diff --git a/file.h b/file.h
index ce92ff75..e57bebcf 100644
--- a/file.h
+++ b/file.h
@@ -6,7 +6,8 @@
 #include "io_ddir.h"
 #include "flist.h"
 #include "lib/zipf.h"
-#include "lib/bitmap.h"
+#include "lib/axmap.h"
+#include "lib/lfsr.h"
 
 /*
  * The type of object we are working on
@@ -62,8 +63,8 @@ struct fio_file {
 	struct flist_head hash_list;
 	enum fio_filetype filetype;
 
-	void *file_data;
 	int fd;
+	int shadow_fd;
 #ifdef WIN32
 	HANDLE hFile;
 	HANDLE ioCP;
@@ -96,7 +97,7 @@ struct fio_file {
 	/*
 	 * For use by the io engine
 	 */
-	unsigned long long file_pos;
+	uint64_t engine_data;
 
 	/*
 	 * if io is protected by a semaphore, this is set
@@ -109,7 +110,9 @@ struct fio_file {
 	/*
 	 * block map for random io
 	 */
-	struct bitmap *io_bitmap;
+	struct axmap *io_axmap;
+
+	struct fio_lfsr lfsr;
 
 	/*
 	 * Used for zipf random distribution
@@ -177,9 +180,8 @@ static inline void fio_file_reset(struct fio_file *f)
 {
 	f->last_pos = f->file_offset;
 	f->last_start = -1ULL;
-	f->file_pos = -1ULL;
-	if (f->io_bitmap)
-		bitmap_reset(f->io_bitmap);
+	if (f->io_axmap)
+		axmap_reset(f->io_axmap);
 }
 
 #endif