refscale: Simplify the errexit checkpoint

There is only the one OOM error case in main_func(), so this commit
eliminates the errexit local variable in favor of a branch to cleanup
code.

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

diff --git a/kernel/rcu/refscale.c b/kernel/rcu/refscale.c
index 1631ef8a138dbfb522ce709793a5e805d5f560ef..b59457cef88d52c742ad86398233105eaed6abf9 100644 (file)
--- a/kernel/rcu/refscale.c
+++ b/kernel/rcu/refscale.c
@@ -637,7 +637,6 @@ static u64 process_durations(int n)
 // point all the timestamps are printed.
 static int main_func(void *arg)
 {
-       bool errexit = false;
        int exp, r;
        char buf1[64];
        char *buf;
@@ -651,7 +650,7 @@ static int main_func(void *arg)
        buf = kzalloc(64 + nruns * 32, GFP_KERNEL);
        if (!result_avg || !buf) {
                VERBOSE_SCALEOUT_ERRSTRING("out of memory");
-               errexit = true;
+               goto oom_exit;
        }
        if (holdoff)
                schedule_timeout_interruptible(holdoff * HZ);
@@ -663,8 +662,6 @@ static int main_func(void *arg)
 
        // Start exp readers up per experiment
        for (exp = 0; exp < nruns && !torture_must_stop(); exp++) {
-               if (errexit)
-                       break;
                if (torture_must_stop())
                        goto end;
 
@@ -698,26 +695,22 @@ static int main_func(void *arg)
        // Print the average of all experiments
        SCALEOUT("END OF TEST. Calculating average duration per loop (nanoseconds)...\n");
 
-       if (!errexit) {
-               buf[0] = 0;
-               strcat(buf, "\n");
-               strcat(buf, "Runs\tTime(ns)\n");
-       }
+       buf[0] = 0;
+       strcat(buf, "\n");
+       strcat(buf, "Runs\tTime(ns)\n");
 
        for (exp = 0; exp < nruns; exp++) {
                u64 avg;
                u32 rem;
 
-               if (errexit)
-                       break;
                avg = div_u64_rem(result_avg[exp], 1000, &rem);
                sprintf(buf1, "%d\t%llu.%03u\n", exp + 1, avg, rem);
                strcat(buf, buf1);
        }
 
-       if (!errexit)
-               SCALEOUT("%s", buf);
+       SCALEOUT("%s", buf);
 
+oom_exit:
        // This will shutdown everything including us.
        if (shutdown) {
                shutdown_start = 1;