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

srcu: Fix long lines in srcu_get_delay() 



This commit creates an srcu_usage pointer named "sup" as a shorter
synonym for the "ssp->srcu_sup" that was bloating several lines of code.

Tested-by: default avatarSachin Sant <sachinp@linux.ibm.com>
Tested-by: default avatar"Zhang, Qiang1" <qiang1.zhang@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Tested-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent a7bf4d7c

kernel/rcu/srcutree.c

+6 −5
Original line number Diff line number Diff line
@@ -616,17 +616,18 @@ static unsigned long srcu_get_delay(struct srcu_struct *ssp) 
	unsigned long gpstart;

	unsigned long j;

	unsigned long jbase = SRCU_INTERVAL;

	struct srcu_usage *sup = ssp->srcu_sup;



	if (ULONG_CMP_LT(READ_ONCE(ssp->srcu_sup->srcu_gp_seq), READ_ONCE(ssp->srcu_sup->srcu_gp_seq_needed_exp)))

	if (ULONG_CMP_LT(READ_ONCE(sup->srcu_gp_seq), READ_ONCE(sup->srcu_gp_seq_needed_exp)))

		jbase = 0;

	if (rcu_seq_state(READ_ONCE(ssp->srcu_sup->srcu_gp_seq))) {

	if (rcu_seq_state(READ_ONCE(sup->srcu_gp_seq))) {

		j = jiffies - 1;

		gpstart = READ_ONCE(ssp->srcu_sup->srcu_gp_start);

		gpstart = READ_ONCE(sup->srcu_gp_start);

		if (time_after(j, gpstart))

			jbase += j - gpstart;

		if (!jbase) {

			WRITE_ONCE(ssp->srcu_sup->srcu_n_exp_nodelay, READ_ONCE(ssp->srcu_sup->srcu_n_exp_nodelay) + 1);

			if (READ_ONCE(ssp->srcu_sup->srcu_n_exp_nodelay) > srcu_max_nodelay_phase)

			WRITE_ONCE(sup->srcu_n_exp_nodelay, READ_ONCE(sup->srcu_n_exp_nodelay) + 1);

			if (READ_ONCE(sup->srcu_n_exp_nodelay) > srcu_max_nodelay_phase)

				jbase = 1;

		}

	}