rcutorture: Replace multi-instance kzalloc() with kcalloc()

This commit replaces array-allocation calls to kzalloc() with
equivalent calls to kcalloc().

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 308e6fdbced8450512cde14e0a45e70833440de4..b4a201dcbc55c9a4a7b80c3851d2a32a76ec4aea 100644 (file)
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -1557,11 +1557,10 @@ static int rcu_torture_barrier_init(void)
        atomic_set(&barrier_cbs_count, 0);
        atomic_set(&barrier_cbs_invoked, 0);
        barrier_cbs_tasks =
-               kzalloc(n_barrier_cbs * sizeof(barrier_cbs_tasks[0]),
+               kcalloc(n_barrier_cbs, sizeof(barrier_cbs_tasks[0]),
                        GFP_KERNEL);
        barrier_cbs_wq =
-               kzalloc(n_barrier_cbs * sizeof(barrier_cbs_wq[0]),
-                       GFP_KERNEL);
+               kcalloc(n_barrier_cbs, sizeof(barrier_cbs_wq[0]), GFP_KERNEL);
        if (barrier_cbs_tasks == NULL || !barrier_cbs_wq)
                return -ENOMEM;
        for (i = 0; i < n_barrier_cbs; i++) {
@@ -1799,7 +1798,7 @@ rcu_torture_init(void)
        if (firsterr)
                goto unwind;
        if (nfakewriters > 0) {
-               fakewriter_tasks = kzalloc(nfakewriters *
+               fakewriter_tasks = kcalloc(nfakewriters,
                                           sizeof(fakewriter_tasks[0]),
                                           GFP_KERNEL);
                if (fakewriter_tasks == NULL) {
@@ -1814,7 +1813,7 @@ rcu_torture_init(void)
                if (firsterr)
                        goto unwind;
        }
-       reader_tasks = kzalloc(nrealreaders * sizeof(reader_tasks[0]),
+       reader_tasks = kcalloc(nrealreaders, sizeof(reader_tasks[0]),
                               GFP_KERNEL);
        if (reader_tasks == NULL) {
                VERBOSE_TOROUT_ERRSTRING("out of memory");