Merge branch 'atomic-writes'

[fio.git] / cconv.c

diff --git a/cconv.c b/cconv.c
index 9b344940cb73f0676c71560f82b074ff3c26f8a1..9571f1a8ad509dd875c72ab989652d46686e2c41 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -216,6 +216,7 @@ int convert_thread_options_to_cpu(struct thread_options *o,
        o->log_max = le32_to_cpu(top->log_max);
        o->log_offset = le32_to_cpu(top->log_offset);
        o->log_prio = le32_to_cpu(top->log_prio);
+       o->log_issue_time = le32_to_cpu(top->log_issue_time);
        o->log_gz = le32_to_cpu(top->log_gz);
        o->log_gz_store = le32_to_cpu(top->log_gz_store);
        o->log_alternate_epoch = le32_to_cpu(top->log_alternate_epoch);
@@ -359,7 +360,7 @@ int convert_thread_options_to_cpu(struct thread_options *o,
        o->dp_id_select = le32_to_cpu(top->dp_id_select);
        o->dp_nr_ids = le32_to_cpu(top->dp_nr_ids);
        for (i = 0; i < o->dp_nr_ids; i++)
-               o->dp_ids[i] = le32_to_cpu(top->dp_ids[i]);
+               o->dp_ids[i] = le16_to_cpu(top->dp_ids[i]);
 #if 0
        uint8_t cpumask[FIO_TOP_STR_MAX];
        uint8_t verify_cpumask[FIO_TOP_STR_MAX];
@@ -458,6 +459,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->log_max = cpu_to_le32(o->log_max);
        top->log_offset = cpu_to_le32(o->log_offset);
        top->log_prio = cpu_to_le32(o->log_prio);
+       top->log_issue_time = cpu_to_le32(o->log_issue_time);
        top->log_gz = cpu_to_le32(o->log_gz);
        top->log_gz_store = cpu_to_le32(o->log_gz_store);
        top->log_alternate_epoch = cpu_to_le32(o->log_alternate_epoch);
@@ -659,7 +661,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->dp_id_select = cpu_to_le32(o->dp_id_select);
        top->dp_nr_ids = cpu_to_le32(o->dp_nr_ids);
        for (i = 0; i < o->dp_nr_ids; i++)
-               top->dp_ids[i] = cpu_to_le32(o->dp_ids[i]);
+               top->dp_ids[i] = cpu_to_le16(o->dp_ids[i]);
 #if 0
        uint8_t cpumask[FIO_TOP_STR_MAX];
        uint8_t verify_cpumask[FIO_TOP_STR_MAX];