From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Wed, 4 Jul 2018 22:39:40 +0000 (-0700)
Subject: rcu: Simplify rcutorture_get_gp_data()
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~6130^2^2^2~52
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=f7dd7d44fd2db80bfb2c5f81e67b5404b4735312;p=linux.git

rcu: Simplify rcutorture_get_gp_data()

This commit restructures rcutorture_get_gp_data() to take advantage of
the fact that there is only one flavor of RCU.

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

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 46a32999020d..254c78377c22 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -597,21 +597,16 @@ EXPORT_SYMBOL_GPL(show_rcu_gp_kthreads);
 void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
 			    unsigned long *gp_seq)
 {
-	struct rcu_state *rsp = NULL;
-
 	switch (test_type) {
 	case RCU_FLAVOR:
 	case RCU_BH_FLAVOR:
 	case RCU_SCHED_FLAVOR:
-		rsp = &rcu_state;
+		*flags = READ_ONCE(rcu_state.gp_flags);
+		*gp_seq = rcu_seq_current(&rcu_state.gp_seq);
 		break;
 	default:
 		break;
 	}
-	if (rsp == NULL)
-		return;
-	*flags = READ_ONCE(rsp->gp_flags);
-	*gp_seq = rcu_seq_current(&rsp->gp_seq);
 }
 EXPORT_SYMBOL_GPL(rcutorture_get_gp_data);