X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.c;h=8a6275deb6a817ed6519090089f47967f425cc19;hb=a415b2ccee389e27a2d5c8cdb28de9dbd65cea57;hp=32c1d7a4b389bd3c3cc50ba4a989dd7fc1a8d50c;hpb=b7f487cf80a8299a656df9c2214ff73e72956d71;p=fio.git

diff --git a/server.c b/server.c
index 32c1d7a4..8a6275de 100644
--- a/server.c
+++ b/server.c
@@ -293,8 +293,9 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk)
 
 static void add_reply(uint64_t tag, struct flist_head *list)
 {
-	struct fio_net_cmd_reply *reply = (struct fio_net_cmd_reply *) tag;
+	struct fio_net_cmd_reply *reply;
 
+	reply = (struct fio_net_cmd_reply *) (uintptr_t) tag;
 	flist_add_tail(&reply->list, list);
 }
 
@@ -313,8 +314,9 @@ static uint64_t alloc_reply(uint64_t tag, uint16_t opcode)
 
 static void free_reply(uint64_t tag)
 {
-	struct fio_net_cmd_reply *reply = (struct fio_net_cmd_reply *) tag;
+	struct fio_net_cmd_reply *reply;
 
+	reply = (struct fio_net_cmd_reply *) (uintptr_t) tag;
 	free(reply);
 }
 
@@ -666,12 +668,15 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
 		je->t_rate[i]	= cpu_to_le32(je->t_rate[i]);
 		je->m_iops[i]	= cpu_to_le32(je->m_iops[i]);
 		je->t_iops[i]	= cpu_to_le32(je->t_iops[i]);
+		je->rate[i]	= cpu_to_le32(je->rate[i]);
+		je->iops[i]	= cpu_to_le32(je->iops[i]);
 	}
 
 	je->elapsed_sec		= cpu_to_le64(je->elapsed_sec);
 	je->eta_sec		= cpu_to_le64(je->eta_sec);
 	je->nr_threads		= cpu_to_le32(je->nr_threads);
 	je->is_pow2		= cpu_to_le32(je->is_pow2);
+	je->unit_base		= cpu_to_le32(je->unit_base);
 
 	fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, &tag, NULL);
 	free(je);