rcu/nocb: Rename __wake_nocb_leader() to __wake_nocb_gp()

[linux-2.6-block.git] / kernel / rcu / tree_plugin.h

diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index 9d5448217bbc0fb3b3e8c169be6d06896fb16703..7c7870da234a1bb8e041bf813ac51781b18cf5ae 100644 (file)
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -1524,24 +1524,24 @@ bool rcu_is_nocb_cpu(int cpu)
  * Kick the GP kthread for this NOCB group.  Caller holds ->nocb_lock
  * and this function releases it.
  */
-static void __wake_nocb_leader(struct rcu_data *rdp, bool force,
-                              unsigned long flags)
+static void __wake_nocb_gp(struct rcu_data *rdp, bool force,
+                          unsigned long flags)
        __releases(rdp->nocb_lock)
 {
-       struct rcu_data *rdp_leader = rdp->nocb_gp_rdp;
+       struct rcu_data *rdp_gp = rdp->nocb_gp_rdp;
 
        lockdep_assert_held(&rdp->nocb_lock);
-       if (!READ_ONCE(rdp_leader->nocb_gp_kthread)) {
+       if (!READ_ONCE(rdp_gp->nocb_gp_kthread)) {
                raw_spin_unlock_irqrestore(&rdp->nocb_lock, flags);
                return;
        }
-       if (rdp_leader->nocb_gp_sleep || force) {
+       if (rdp_gp->nocb_gp_sleep || force) {
                /* Prior smp_mb__after_atomic() orders against prior enqueue. */
-               WRITE_ONCE(rdp_leader->nocb_gp_sleep, false);
+               WRITE_ONCE(rdp_gp->nocb_gp_sleep, false);
                del_timer(&rdp->nocb_timer);
                raw_spin_unlock_irqrestore(&rdp->nocb_lock, flags);
                smp_mb(); /* ->nocb_gp_sleep before swake_up_one(). */
-               swake_up_one(&rdp_leader->nocb_gp_wq);
+               swake_up_one(&rdp_gp->nocb_gp_wq);
        } else {
                raw_spin_unlock_irqrestore(&rdp->nocb_lock, flags);
        }
@@ -1551,12 +1551,12 @@ static void __wake_nocb_leader(struct rcu_data *rdp, bool force,
  * Kick the GP kthread for this NOCB group, but caller has not
  * acquired locks.
  */
-static void wake_nocb_leader(struct rcu_data *rdp, bool force)
+static void wake_nocb_gp(struct rcu_data *rdp, bool force)
 {
        unsigned long flags;
 
        raw_spin_lock_irqsave(&rdp->nocb_lock, flags);
-       __wake_nocb_leader(rdp, force, flags);
+       __wake_nocb_gp(rdp, force, flags);
 }
 
 /*
@@ -1656,7 +1656,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
        if (old_rhpp == &rdp->nocb_head) {
                if (!irqs_disabled_flags(flags)) {
                        /* ... if queue was empty ... */
-                       wake_nocb_leader(rdp, false);
+                       wake_nocb_gp(rdp, false);
                        trace_rcu_nocb_wake(rcu_state.name, rdp->cpu,
                                            TPS("WakeEmpty"));
                } else {
@@ -1667,7 +1667,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
        } else if (len > rdp->qlen_last_fqs_check + qhimark) {
                /* ... or if many callbacks queued. */
                if (!irqs_disabled_flags(flags)) {
-                       wake_nocb_leader(rdp, true);
+                       wake_nocb_gp(rdp, true);
                        trace_rcu_nocb_wake(rcu_state.name, rdp->cpu,
                                            TPS("WakeOvf"));
                } else {
@@ -1988,7 +1988,7 @@ static void do_nocb_deferred_wakeup_common(struct rcu_data *rdp)
        }
        ndw = READ_ONCE(rdp->nocb_defer_wakeup);
        WRITE_ONCE(rdp->nocb_defer_wakeup, RCU_NOCB_WAKE_NOT);
-       __wake_nocb_leader(rdp, ndw == RCU_NOCB_WAKE_FORCE, flags);
+       __wake_nocb_gp(rdp, ndw == RCU_NOCB_WAKE_FORCE, flags);
        trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("DeferredWake"));
 }