From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 3 Oct 2011 13:03:08 +0000 (+0200)
Subject: server: package defrag fix
X-Git-Tag: fio-1.99~52
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=817f06bbc52aea4011ab975d8fa3e3f1065c6065;p=fio.git

server: package defrag fix

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/server.c b/server.c
index 92d37bd9..7202f10f 100644
--- a/server.c
+++ b/server.c
@@ -135,7 +135,6 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk)
 			cmd_size += cmd.pdu_len;
 
 		cmdret = realloc(cmdret, cmd_size);
-		pdu = (void *) cmdret->payload;
 
 		if (first)
 			memcpy(cmdret, &cmd, sizeof(cmd));
@@ -161,7 +160,8 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk)
 		}
 
 		pdu_offset += cmd.pdu_len;
-		cmdret->pdu_len += cmd.pdu_len;
+		if (!first)
+			cmdret->pdu_len += cmd.pdu_len;
 		first = 0;
 	} while (cmd.flags & FIO_NET_CMD_F_MORE);