commit 298921d65ea914873cbc270af6663dad9e08b782
author Jens Axboe <axboe@kernel.dk> Mon Sep 24 18:47:01 2012 +0200
committer Jens Axboe <axboe@kernel.dk> Mon Sep 24 18:47:01 2012 +0200
tree 5d5c240b989360f90d3e8ad6acf2792f4ec017c1
parent a94eb99a080d01475da47a55de890680d72907b9

client/server: update for trim addition

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

client.c

diff --git a/client.c b/client.c
index 7bd5284..47a2380 100644
--- a/client.c
+++ b/client.c
@@ -690,7 +690,7 @@
 	dst->pid		= le32_to_cpu(src->pid);
 	dst->members		= le32_to_cpu(src->members);
 
-	for (i = 0; i < 2; i++) {
+	for (i = 0; i < DDIR_RWDIR_CNT; i++) {
 		convert_io_stat(&dst->clat_stat[i], &src->clat_stat[i]);
 		convert_io_stat(&dst->slat_stat[i], &src->slat_stat[i]);
 		convert_io_stat(&dst->lat_stat[i], &src->lat_stat[i]);
@@ -722,7 +722,7 @@
 		dst->io_u_lat_m[i]	= le32_to_cpu(src->io_u_lat_m[i]);
 	}
 
-	for (i = 0; i < 2; i++)
+	for (i = 0; i < DDIR_RWDIR_CNT; i++)
 		for (j = 0; j < FIO_IO_U_PLAT_NR; j++)
 			dst->io_u_plat[i][j] = le32_to_cpu(src->io_u_plat[i][j]);
 
@@ -734,7 +734,7 @@
 	dst->total_submit	= le64_to_cpu(src->total_submit);
 	dst->total_complete	= le64_to_cpu(src->total_complete);
 
-	for (i = 0; i < 2; i++) {
+	for (i = 0; i < DDIR_RWDIR_CNT; i++) {
 		dst->io_bytes[i]	= le64_to_cpu(src->io_bytes[i]);
 		dst->runtime[i]		= le64_to_cpu(src->runtime[i]);
 	}
@@ -750,7 +750,7 @@
 {
 	int i;
 
-	for (i = 0; i < 2; i++) {
+	for (i = 0; i < DDIR_RWDIR_CNT; i++) {
 		dst->max_run[i]		= le64_to_cpu(src->max_run[i]);
 		dst->min_run[i]		= le64_to_cpu(src->min_run[i]);
 		dst->max_bw[i]		= le64_to_cpu(src->max_bw[i]);
@@ -862,11 +862,11 @@
 	je->nr_pending		= le32_to_cpu(je->nr_pending);
 	je->files_open		= le32_to_cpu(je->files_open);
 
-	for (i = 0; i < 2; i++) {
-		je->m_rate[i]		= le32_to_cpu(je->m_rate[i]);
-		je->t_rate[i]		= le32_to_cpu(je->t_rate[i]);
-		je->m_iops[i]		= le32_to_cpu(je->m_iops[i]);
-		je->t_iops[i]		= le32_to_cpu(je->t_iops[i]);
+	for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+		je->m_rate[i]	= le32_to_cpu(je->m_rate[i]);
+		je->t_rate[i]	= le32_to_cpu(je->t_rate[i]);
+		je->m_iops[i]	= le32_to_cpu(je->m_iops[i]);
+		je->t_iops[i]	= le32_to_cpu(je->t_iops[i]);
 		je->rate[i]	= le32_to_cpu(je->rate[i]);
 		je->iops[i]	= le32_to_cpu(je->iops[i]);
 	}
@@ -886,7 +886,7 @@
 	dst->nr_pending		+= je->nr_pending;
 	dst->files_open		+= je->files_open;
 
-	for (i = 0; i < 2; i++) {
+	for (i = 0; i < DDIR_RWDIR_CNT; i++) {
 		dst->m_rate[i]	+= je->m_rate[i];
 		dst->t_rate[i]	+= je->t_rate[i];
 		dst->m_iops[i]	+= je->m_iops[i];