X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=cconv.c;h=57c76e32f4d3b96fedbb3330c9d2b7cbabdae4f7;hb=8f91cc3f7835cdca84944d456e1da77d44a7c354;hp=e7339d04f8a74bef6554fe71c49937c2676b6c4a;hpb=836fcc0fceb233ebcc41ee63b4ea5cae20b678a4;p=fio.git

diff --git a/cconv.c b/cconv.c
index e7339d04..57c76e32 100644
--- a/cconv.c
+++ b/cconv.c
@@ -27,6 +27,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	string_to_cpu(&o->name, top->name);
 	string_to_cpu(&o->directory, top->directory);
 	string_to_cpu(&o->filename, top->filename);
+	string_to_cpu(&o->filename_format, top->filename_format);
 	string_to_cpu(&o->opendir, top->opendir);
 	string_to_cpu(&o->ioengine, top->ioengine);
 	string_to_cpu(&o->mmapfile, top->mmapfile);
@@ -45,6 +46,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	o->td_ddir = le32_to_cpu(top->td_ddir);
 	o->rw_seq = le32_to_cpu(top->rw_seq);
 	o->kb_base = le32_to_cpu(top->kb_base);
+	o->unit_base = le32_to_cpu(top->kb_base);
 	o->ddir_seq_nr = le32_to_cpu(top->ddir_seq_nr);
 	o->ddir_seq_add = le64_to_cpu(top->ddir_seq_add);
 	o->iodepth = le32_to_cpu(top->iodepth);
@@ -84,7 +86,6 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	o->nr_files = le32_to_cpu(top->nr_files);
 	o->open_files = le32_to_cpu(top->open_files);
 	o->file_lock_mode = le32_to_cpu(top->file_lock_mode);
-	o->lockfile_batch = le32_to_cpu(top->lockfile_batch);
 	o->odirect = le32_to_cpu(top->odirect);
 	o->invalidate_cache = le32_to_cpu(top->invalidate_cache);
 	o->create_serialize = le32_to_cpu(top->create_serialize);
@@ -172,6 +173,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	o->disable_clat = le32_to_cpu(top->disable_clat);
 	o->disable_slat = le32_to_cpu(top->disable_slat);
 	o->disable_bw = le32_to_cpu(top->disable_bw);
+	o->unified_rw_rep = le32_to_cpu(top->unified_rw_rep);
 	o->gtod_reduce = le32_to_cpu(top->gtod_reduce);
 	o->gtod_cpu = le32_to_cpu(top->gtod_cpu);
 	o->gtod_offload = le32_to_cpu(top->gtod_offload);
@@ -181,7 +183,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
 	o->trim_batch = le32_to_cpu(top->trim_batch);
 	o->trim_zero = le32_to_cpu(top->trim_zero);
 	o->clat_percentiles = le32_to_cpu(top->clat_percentiles);
-	o->overwrite_plist = le32_to_cpu(top->overwrite_plist);
+	o->percentile_precision = le32_to_cpu(top->percentile_precision);
 	o->continue_on_error = le32_to_cpu(top->continue_on_error);
 	o->cgroup_weight = le32_to_cpu(top->cgroup_weight);
 	o->cgroup_nodelete = le32_to_cpu(top->cgroup_nodelete);
@@ -214,6 +216,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	string_to_net(top->name, o->name);
 	string_to_net(top->directory, o->directory);
 	string_to_net(top->filename, o->filename);
+	string_to_net(top->filename_format, o->filename_format);
 	string_to_net(top->opendir, o->opendir);
 	string_to_net(top->ioengine, o->ioengine);
 	string_to_net(top->mmapfile, o->mmapfile);
@@ -232,6 +235,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	top->td_ddir = cpu_to_le32(o->td_ddir);
 	top->rw_seq = cpu_to_le32(o->rw_seq);
 	top->kb_base = cpu_to_le32(o->kb_base);
+	top->unit_base = cpu_to_le32(o->kb_base);
 	top->ddir_seq_nr = cpu_to_le32(o->ddir_seq_nr);
 	top->iodepth = cpu_to_le32(o->iodepth);
 	top->iodepth_low = cpu_to_le32(o->iodepth_low);
@@ -243,7 +247,6 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	top->nr_files = cpu_to_le32(o->nr_files);
 	top->open_files = cpu_to_le32(o->open_files);
 	top->file_lock_mode = cpu_to_le32(o->file_lock_mode);
-	top->lockfile_batch = cpu_to_le32(o->lockfile_batch);
 	top->odirect = cpu_to_le32(o->odirect);
 	top->invalidate_cache = cpu_to_le32(o->invalidate_cache);
 	top->create_serialize = cpu_to_le32(o->create_serialize);
@@ -317,6 +320,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	top->disable_clat = cpu_to_le32(o->disable_clat);
 	top->disable_slat = cpu_to_le32(o->disable_slat);
 	top->disable_bw = cpu_to_le32(o->disable_bw);
+	top->unified_rw_rep = cpu_to_le32(o->unified_rw_rep);
 	top->gtod_reduce = cpu_to_le32(o->gtod_reduce);
 	top->gtod_cpu = cpu_to_le32(o->gtod_cpu);
 	top->gtod_offload = cpu_to_le32(o->gtod_offload);
@@ -326,7 +330,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
 	top->trim_batch = cpu_to_le32(o->trim_batch);
 	top->trim_zero = cpu_to_le32(o->trim_zero);
 	top->clat_percentiles = cpu_to_le32(o->clat_percentiles);
-	top->overwrite_plist = cpu_to_le32(o->overwrite_plist);
+	top->percentile_precision = cpu_to_le32(o->percentile_precision);
 	top->continue_on_error = cpu_to_le32(o->continue_on_error);
 	top->cgroup_weight = cpu_to_le32(o->cgroup_weight);
 	top->cgroup_nodelete = cpu_to_le32(o->cgroup_nodelete);