Merge branch 'master' into gfio

[fio.git] / client.c

diff --git a/client.c b/client.c
index 5dcc5f5410bf712e1947b1e66391eaab7335a545..c1e516d5288d7453798d1cd8d217280d5d637bd7 100644 (file)
--- a/client.c
+++ b/client.c
@@ -846,6 +846,7 @@ static void convert_jobs_eta(struct jobs_eta *je)
        je->elapsed_sec         = le64_to_cpu(je->elapsed_sec);
        je->eta_sec             = le64_to_cpu(je->eta_sec);
        je->nr_threads          = le32_to_cpu(je->nr_threads);
+       je->is_pow2             = le32_to_cpu(je->is_pow2);
 }
 
 void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
@@ -966,9 +967,9 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd)
 
        sprintf(bit, "%d-bit", probe->bpp * 8);
 
-       log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%u.%u.%u\n",
+       log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s\n",
                probe->hostname, probe->bigendian, bit, os, arch,
-               probe->fio_major, probe->fio_minor, probe->fio_patch);
+               probe->fio_version);
 
        if (!client->name)
                client->name = strdup((char *) probe->hostname);