Merge branch 'master' into gfio
Conflicts:
client.c
fio.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/thread_options.h b/thread_options.h
index 1193abe..c0fd7e2 100644
--- a/thread_options.h
+++ b/thread_options.h
@@ -146,6 +146,8 @@
unsigned int zero_buffers;
unsigned int refill_buffers;
unsigned int scramble_buffers;
+ unsigned int compress_percentage;
+ unsigned int compress_chunk;
unsigned int time_based;
unsigned int disable_lat;
unsigned int disable_clat;
@@ -331,6 +333,8 @@
uint32_t zero_buffers;
uint32_t refill_buffers;
uint32_t scramble_buffers;
+ unsigned int compress_percentage;
+ unsigned int compress_chunk;
uint32_t time_based;
uint32_t disable_lat;
uint32_t disable_clat;