rcutorture: Expand rcu_torture_write_types() first "if" statement
authorPaul E. McKenney <paulmck@kernel.org>
Tue, 23 Aug 2022 19:11:12 +0000 (12:11 -0700)
committerPaul E. McKenney <paulmck@kernel.org>
Wed, 31 Aug 2022 12:09:22 +0000 (05:09 -0700)
This commit expands the rcu_torture_write_types() function's first "if"
condition and body, placing one element per line, in order to make the
compiler's error messages more helpful.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
kernel/rcu/rcutorture.c

index 71d1af9c060e1890b17982b1fef3586c49e3dc41..fe1836aad646660a71e32ec645ec1d0e93722273 100644 (file)
@@ -1195,12 +1195,29 @@ static void rcu_torture_write_types(void)
        bool gp_poll_full1 = gp_poll_full, gp_sync1 = gp_sync;
 
        /* Initialize synctype[] array.  If none set, take default. */
-       if (!gp_cond1 && !gp_cond_exp1 && !gp_cond_full1 && !gp_cond_exp_full1 && !gp_exp1 &&
-           !gp_poll_exp1 && !gp_poll_exp_full1 && !gp_normal1 && !gp_poll1 && !gp_poll_full1 &&
-           !gp_sync1)
-               gp_cond1 = gp_cond_exp1 = gp_cond_full1 = gp_cond_exp_full1 = gp_exp1 =
-                          gp_poll_exp1 = gp_poll_exp_full1 = gp_normal1 = gp_poll1 =
-                          gp_poll_full1 = gp_sync1 = true;
+       if (!gp_cond1 &&
+           !gp_cond_exp1 &&
+           !gp_cond_full1 &&
+           !gp_cond_exp_full1 &&
+           !gp_exp1 &&
+           !gp_poll_exp1 &&
+           !gp_poll_exp_full1 &&
+           !gp_normal1 &&
+           !gp_poll1 &&
+           !gp_poll_full1 &&
+           !gp_sync1) {
+               gp_cond1 = true;
+               gp_cond_exp1 = true;
+               gp_cond_full1 = true;
+               gp_cond_exp_full1 = true;
+               gp_exp1 = true;
+               gp_poll_exp1 = true;
+               gp_poll_exp_full1 = true;
+               gp_normal1 = true;
+               gp_poll1 = true;
+               gp_poll_full1 = true;
+               gp_sync1 = true;
+       }
        if (gp_cond1 && cur_ops->get_gp_state && cur_ops->cond_sync) {
                synctype[nsynctypes++] = RTWS_COND_GET;
                pr_info("%s: Testing conditional GPs.\n", __func__);