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

rcu: Shorten expedited_workdone* to exp_workdone* 



Just a name change to save a few lines and a bit of typing.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent ec3833ed

kernel/rcu/tree.c

+3 −5
Original line number Diff line number Diff line
@@ -3624,15 +3624,14 @@ static struct rcu_node *exp_funnel_lock(struct rcu_state *rsp, unsigned long s) 
	 * can be inexact, as it is just promoting locality and is not

	 * strictly needed for correctness.

	 */

	if (sync_exp_work_done(rsp, NULL, NULL, &rdp->expedited_workdone1, s))

	if (sync_exp_work_done(rsp, NULL, NULL, &rdp->exp_workdone1, s))

		return NULL;

	mutex_lock(&rdp->exp_funnel_mutex);

	trace_rcu_exp_funnel_lock(rsp->name, rdp->mynode->level + 1,

				  rdp->cpu, rdp->cpu, TPS("acq"));

	rnp0 = rdp->mynode;

	for (; rnp0 != NULL; rnp0 = rnp0->parent) {

		if (sync_exp_work_done(rsp, rnp1, rdp,

				       &rdp->expedited_workdone2, s))

		if (sync_exp_work_done(rsp, rnp1, rdp, &rdp->exp_workdone2, s))

			return NULL;

		mutex_lock(&rnp0->exp_funnel_mutex);

		trace_rcu_exp_funnel_lock(rsp->name, rnp0->level,
@@ -3651,8 +3650,7 @@ static struct rcu_node *exp_funnel_lock(struct rcu_state *rsp, unsigned long s) 
		}

		rnp1 = rnp0;

	}

	if (sync_exp_work_done(rsp, rnp1, rdp,

			       &rdp->expedited_workdone3, s))

	if (sync_exp_work_done(rsp, rnp1, rdp, &rdp->exp_workdone3, s))

		return NULL;

	return rnp1;

}

kernel/rcu/tree.h

+3 −3
Original line number Diff line number Diff line
@@ -388,9 +388,9 @@ struct rcu_data { 
	struct rcu_head oom_head;

#endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */

	struct mutex exp_funnel_mutex;

	atomic_long_t expedited_workdone1;	/* # done by others #1. */

	atomic_long_t expedited_workdone2;	/* # done by others #2. */

	atomic_long_t expedited_workdone3;	/* # done by others #3. */

	atomic_long_t exp_workdone1;	/* # done by others #1. */

	atomic_long_t exp_workdone2;	/* # done by others #2. */

	atomic_long_t exp_workdone3;	/* # done by others #3. */



	/* 7) Callback offloading. */

#ifdef CONFIG_RCU_NOCB_CPU

kernel/rcu/tree_trace.c

+3 −3
Original line number Diff line number Diff line
@@ -189,9 +189,9 @@ static int show_rcuexp(struct seq_file *m, void *v) 


	for_each_possible_cpu(cpu) {

		rdp = per_cpu_ptr(rsp->rda, cpu);

		s1 += atomic_long_read(&rdp->expedited_workdone1);

		s2 += atomic_long_read(&rdp->expedited_workdone2);

		s3 += atomic_long_read(&rdp->expedited_workdone3);

		s1 += atomic_long_read(&rdp->exp_workdone1);

		s2 += atomic_long_read(&rdp->exp_workdone2);

		s3 += atomic_long_read(&rdp->exp_workdone3);

	}

	seq_printf(m, "s=%lu wd1=%lu wd2=%lu wd3=%lu n=%lu enq=%d sc=%lu\n",

		   rsp->expedited_sequence, s1, s2, s3,