X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=b895dc31eb4079ea2b482508b6eab9849eacf4c4;hb=178cde9ff403da53428c5962b8600e47b4580d80;hp=891b3a312c2fb1ab4e2e8ec886225789a698aef2;hpb=8111092fd5dfc2fbdfc9b5b30094b74de982bddb;p=fio.git

diff --git a/server.h b/server.h
index 891b3a31..b895dc31 100644
--- a/server.h
+++ b/server.h
@@ -26,8 +26,9 @@ struct fio_net_cmd {
 };
 
 enum {
-	FIO_SERVER_VER		= 1,
+	FIO_SERVER_VER		= 2,
 	FIO_SERVER_VER1		= 1,
+	FIO_SERVER_VER2		= 2,
 
 	FIO_SERVER_MAX_PDU	= 64,
 
@@ -87,12 +88,12 @@ extern int fio_clients_connect(void);
 extern int fio_clients_send_ini(const char *);
 extern int fio_handle_clients(void);
 extern void fio_client_add(const char *);
-extern void fio_client_add_cmd_option(const char *, const char *);
+extern int fio_client_add_cmd_option(const char *, const char *);
 
 extern int fio_recv_data(int sk, void *p, unsigned int len);
 extern int fio_send_data(int sk, const void *p, unsigned int len);
 extern void fio_net_cmd_crc(struct fio_net_cmd *);
-extern struct fio_net_cmd *fio_net_recv_cmd(int sk, int block);
+extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
 
 extern int exit_backend;
 extern int fio_net_port;
@@ -102,7 +103,7 @@ static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
 {
 	memset(cmd, 0, sizeof(*cmd));
 
-	cmd->version	= __cpu_to_le16(FIO_SERVER_VER1);
+	cmd->version	= __cpu_to_le16(FIO_SERVER_VER2);
 	cmd->opcode	= cpu_to_le16(opcode);
 
 	if (pdu) {