Commit aeb9b39b authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

srcu: Compute snp_seq earlier in srcu_funnel_gp_start() 



Currently, srcu_funnel_gp_start() tests snp->srcu_have_cbs[idx] and then
separately assigns it to the snp_seq local variable.  This commit does
the assignment earlier to simplify the code a bit.  While in the area,
this commit also takes advantage of the 100-character line limit to put
the call to srcu_schedule_cbs_sdp() on a single line.

Co-developed-by: default avatarNeeraj Upadhyay <quic_neeraju@quicinc.com>
Signed-off-by: default avatarNeeraj Upadhyay <quic_neeraju@quicinc.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 3bedebcf

kernel/rcu/srcutree.c

+3 −5
Original line number Diff line number Diff line
@@ -697,15 +697,13 @@ static void srcu_funnel_gp_start(struct srcu_struct *ssp, struct srcu_data *sdp, 
			if (rcu_seq_done(&ssp->srcu_gp_seq, s) && snp != snp_leaf)

				return; /* GP already done and CBs recorded. */

			spin_lock_irqsave_rcu_node(snp, flags);

			if (ULONG_CMP_GE(snp->srcu_have_cbs[idx], s)) {

			snp_seq = snp->srcu_have_cbs[idx];

			if (ULONG_CMP_GE(snp_seq, s)) {

				if (snp == snp_leaf && snp_seq == s)

					snp->srcu_data_have_cbs[idx] |= sdp->grpmask;

				spin_unlock_irqrestore_rcu_node(snp, flags);

				if (snp == snp_leaf && snp_seq != s) {

					srcu_schedule_cbs_sdp(sdp, do_norm

								   ? SRCU_INTERVAL

								   : 0);

					srcu_schedule_cbs_sdp(sdp, do_norm ? SRCU_INTERVAL : 0);

					return;

				}

				if (!do_norm)