server/client: don't use __ conversion functions if not needed

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

diff --git a/client.c b/client.c
index 928f7d38be47aa19ba5cdebc207dc268ca986695..6b9fdd8dbfb8e784a9205bcd4c7ff99d97ae3ae1 100644 (file)
--- a/client.c
+++ b/client.c
@@ -952,7 +952,7 @@ static void convert_agg(struct disk_util_agg *agg)
        agg->io_ticks           = le32_to_cpu(agg->io_ticks);
        agg->time_in_queue      = le32_to_cpu(agg->time_in_queue);
        agg->slavecount         = le32_to_cpu(agg->slavecount);
        agg->io_ticks           = le32_to_cpu(agg->io_ticks);
        agg->time_in_queue      = le32_to_cpu(agg->time_in_queue);
        agg->slavecount         = le32_to_cpu(agg->slavecount);

-       agg->max_util.u.f       = fio_uint64_to_double(__le64_to_cpu(agg->max_util.u.i));
+       agg->max_util.u.f       = fio_uint64_to_double(le64_to_cpu(agg->max_util.u.i));

 }
 
 static void convert_dus(struct disk_util_stat *dus)
 }
 
 static void convert_dus(struct disk_util_stat *dus)

diff --git a/server.c b/server.c
index 33c512c78f96a5d19cd0f110b6d418d581ad1357..b5bf8780743b0923a590d624602e8784ac5b53f0 100644 (file)
--- a/server.c
+++ b/server.c
@@ -980,8 +980,8 @@ static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
        /*
         * Encode to IEEE 754 for network transfer
         */
        /*
         * Encode to IEEE 754 for network transfer
         */

-       dst->mean.u.i   = __cpu_to_le64(fio_double_to_uint64(src->mean.u.f));
-       dst->S.u.i      = __cpu_to_le64(fio_double_to_uint64(src->S.u.f));
+       dst->mean.u.i   = cpu_to_le64(fio_double_to_uint64(src->mean.u.f));
+       dst->S.u.i      = cpu_to_le64(fio_double_to_uint64(src->S.u.f));

 }
 
 static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
 }
 
 static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)


@@ -1045,7 +1045,7 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
                fio_fp64_t *src = &ts->percentile_list[i];
                fio_fp64_t *dst = &p.ts.percentile_list[i];
 
                fio_fp64_t *src = &ts->percentile_list[i];
                fio_fp64_t *dst = &p.ts.percentile_list[i];
 

-               dst->u.i = __cpu_to_le64(fio_double_to_uint64(src->u.f));
+               dst->u.i = cpu_to_le64(fio_double_to_uint64(src->u.f));

        }
 
        for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
        }
 
        for (i = 0; i < FIO_IO_U_MAP_NR; i++) {


@@ -1087,7 +1087,7 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
        p.ts.latency_depth      = cpu_to_le32(ts->latency_depth);
        p.ts.latency_target     = cpu_to_le64(ts->latency_target);
        p.ts.latency_window     = cpu_to_le64(ts->latency_window);
        p.ts.latency_depth      = cpu_to_le32(ts->latency_depth);
        p.ts.latency_target     = cpu_to_le64(ts->latency_target);
        p.ts.latency_window     = cpu_to_le64(ts->latency_window);

-       p.ts.latency_percentile.u.i = __cpu_to_le64(fio_double_to_uint64(ts->latency_percentile.u.f));
+       p.ts.latency_percentile.u.i = cpu_to_le64(fio_double_to_uint64(ts->latency_percentile.u.f));

 
        convert_gs(&p.rs, rs);
 
 
        convert_gs(&p.rs, rs);
 


@@ -1118,7 +1118,7 @@ static void convert_agg(struct disk_util_agg *dst, struct disk_util_agg *src)
        dst->io_ticks           = cpu_to_le32(src->io_ticks);
        dst->time_in_queue      = cpu_to_le32(src->time_in_queue);
        dst->slavecount         = cpu_to_le32(src->slavecount);
        dst->io_ticks           = cpu_to_le32(src->io_ticks);
        dst->time_in_queue      = cpu_to_le32(src->time_in_queue);
        dst->slavecount         = cpu_to_le32(src->slavecount);

-       dst->max_util.u.i       = __cpu_to_le64(fio_double_to_uint64(src->max_util.u.f));
+       dst->max_util.u.i       = cpu_to_le64(fio_double_to_uint64(src->max_util.u.f));

 }
 
 static void convert_dus(struct disk_util_stat *dst, struct disk_util_stat *src)
 }
 
 static void convert_dus(struct disk_util_stat *dst, struct disk_util_stat *src)