Bring in additional sg error cases from Linux kernel (and sg3) header

[fio.git] / cconv.c

diff --git a/cconv.c b/cconv.c
index 0032cc04ae06ba8cf14be26a82822db0d1ef10c7..0c1162916c6309fd1da82c0c4e76674f355ffd1a 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -88,7 +88,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->unit_base = le32_to_cpu(top->unit_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);
@@ -213,6 +213,10 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->start_delay_high = le64_to_cpu(top->start_delay_high);
        o->timeout = le64_to_cpu(top->timeout);
        o->ramp_time = le64_to_cpu(top->ramp_time);
+       o->ss_dur = le64_to_cpu(top->ss_dur);
+       o->ss_ramp_time = le64_to_cpu(top->ss_ramp_time);
+       o->ss_state = le32_to_cpu(top->ss_state);
+       o->ss_limit.u.f = fio_uint64_to_double(le64_to_cpu(top->ss_limit.u.i));
        o->zone_range = le64_to_cpu(top->zone_range);
        o->zone_size = le64_to_cpu(top->zone_size);
        o->zone_skip = le64_to_cpu(top->zone_skip);
@@ -332,7 +336,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->unit_base = cpu_to_le32(o->unit_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);
@@ -523,6 +527,10 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->start_delay_high = __cpu_to_le64(o->start_delay_high);
        top->timeout = __cpu_to_le64(o->timeout);
        top->ramp_time = __cpu_to_le64(o->ramp_time);
+       top->ss_dur = __cpu_to_le64(top->ss_dur);
+       top->ss_ramp_time = __cpu_to_le64(top->ss_ramp_time);
+       top->ss_state = cpu_to_le32(top->ss_state);
+       top->ss_limit.u.i = __cpu_to_le64(fio_double_to_uint64(o->ss_limit.u.f));
        top->zone_range = __cpu_to_le64(o->zone_range);
        top->zone_size = __cpu_to_le64(o->zone_size);
        top->zone_skip = __cpu_to_le64(o->zone_skip);