commit 572cfb3f4d2cbf22291b395f2bb41facdc17ce86
author Jens Axboe <axboe@kernel.dk> Fri Dec 06 12:02:10 2013 -0700
committer Jens Axboe <axboe@kernel.dk> Fri Dec 06 12:02:10 2013 -0700
tree de61b4b93791b11cfeec2c3c7ac8587f3e31dede
parent e171fde52d9c2d0247365793d464a2a3c5e3af22

Calloc() cleanup

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

profiles/act.c

diff --git a/profiles/act.c b/profiles/act.c
index 73cde85..7e2f8af 100644
--- a/profiles/act.c
+++ b/profiles/act.c
@@ -389,7 +389,7 @@
 	fio_mutex_down(act_run_data->mutex);
 
 	if (!act_run_data->slices) {
-		act_run_data->slices = calloc(sizeof(struct act_slice), apd->nr_slices);
+		act_run_data->slices = calloc(apd->nr_slices, sizeof(struct act_slice));
 		act_run_data->nr_slices = apd->nr_slices;
 	}
 
@@ -416,9 +416,9 @@
 
 	get_act_ref();
 
-	apd = calloc(sizeof(*apd), 1);
+	apd = calloc(1, sizeof(*apd));
 	nr_slices = (test_duration + SAMPLE_SEC - 1) / SAMPLE_SEC;
-	apd->slices = calloc(sizeof(struct act_slice), nr_slices);
+	apd->slices = calloc(nr_slices, sizeof(struct act_slice));
 	apd->nr_slices = nr_slices;
 	fio_gettime(&apd->sample_tv, NULL);
 	td->prof_data = apd;
@@ -452,7 +452,7 @@
 
 static void fio_init act_register(void)
 {
-	act_run_data = calloc(sizeof(*act_run_data), 1);
+	act_run_data = calloc(1, sizeof(*act_run_data));
 	act_run_data->mutex = fio_mutex_init(FIO_MUTEX_UNLOCKED);
 
 	if (register_profile(&act_profile))