Merge branch 'axmap' of https://github.com/bvanassche/fio

[fio.git] / client.c

diff --git a/client.c b/client.c
index 611ee2f5a3f929d9d7ae7c7d14c229196bdfedbb..e2525c812a94fd91c296e35ccff8c87255b31de5 100644 (file)
--- a/client.c
+++ b/client.c
@@ -130,8 +130,11 @@ static int read_ini_data(int fd, void *data, size_t size)
                return errno;
 
        fp = fdopen(dupfd, "r");
-       if (!fp)
-               return errno;
+       if (!fp) {
+               ret = errno;
+               close(dupfd);
+               goto out;
+       }
 
        while (1) {
                ssize_t len;
@@ -163,6 +166,7 @@ static int read_ini_data(int fd, void *data, size_t size)
        }
 
        fclose(fp);
+out:
        return ret;
 }
 
@@ -1353,8 +1357,8 @@ static void client_flush_hist_samples(FILE *f, int hist_coarseness, void *sample
                entry = s->data.plat_entry;
                io_u_plat = entry->io_u_plat;
 
-               fprintf(f, "%lu, %u, %u, ", (unsigned long) s->time,
-                                               io_sample_ddir(s), s->bs);
+               fprintf(f, "%lu, %u, %llu, ", (unsigned long) s->time,
+                                               io_sample_ddir(s), (unsigned long long) s->bs);
                for (j = 0; j < FIO_IO_U_PLAT_NR - stride; j += stride) {
                        fprintf(f, "%llu, ", (unsigned long long)hist_sum(j, stride, io_u_plat, NULL));
                }
@@ -1643,7 +1647,7 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd,
                s->time         = le64_to_cpu(s->time);
                s->data.val     = le64_to_cpu(s->data.val);
                s->__ddir       = le32_to_cpu(s->__ddir);
-               s->bs           = le32_to_cpu(s->bs);
+               s->bs           = le64_to_cpu(s->bs);
 
                if (ret->log_offset) {
                        struct io_sample_offset *so = (void *) s;