Fix unit_base kb_base mixup in thread option conversion functions

Don't set unit_base, which is 1 or 8, to kb_base, which is 1000
or 1024, during the convert functions used by the initial cconv test.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/cconv.c b/cconv.c
index 336805be5e60d8b8274a038ad803e9934ca2579e..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->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);
        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);


@@ -336,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->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);
        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);