rcu: Rename rcu_data's ->deferred_qs to ->exp_deferred_qs

The rcu_data structure's ->deferred_qs field is used to indicate that the
current CPU is blocking an expedited grace period (perhaps a future one).
Given that it is used only for expedited grace periods, its current name
is misleading, so this commit renames it to ->exp_deferred_qs.

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

1 files changed, 7 insertions, 7 deletions

diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index 58c7853f19e7..1aeb4ae187ce 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -237,10 +237,10 @@ static void rcu_preempt_ctxt_queue(struct rcu_node *rnp, struct rcu_data *rdp)
          * no need to check for a subsequent expedited GP.  (Though we are
          * still in a quiescent state in any case.)
          */
-        if (blkd_state & RCU_EXP_BLKD && rdp->deferred_qs)
+        if (blkd_state & RCU_EXP_BLKD && rdp->exp_deferred_qs)
                 rcu_report_exp_rdp(rdp);
         else
-                WARN_ON_ONCE(rdp->deferred_qs);
+                WARN_ON_ONCE(rdp->exp_deferred_qs);
 }
 
 /*
@@ -337,7 +337,7 @@ void rcu_note_context_switch(bool preempt)
          * means that we continue to block the current grace period.
          */
         rcu_qs();
-        if (rdp->deferred_qs)
+        if (rdp->exp_deferred_qs)
                 rcu_report_exp_rdp(rdp);
         trace_rcu_utilization(TPS("End context switch"));
         barrier(); /* Avoid RCU read-side critical sections leaking up. */
@@ -451,7 +451,7 @@ rcu_preempt_deferred_qs_irqrestore(struct task_struct *t, unsigned long flags)
          */
         special = t->rcu_read_unlock_special;
         rdp = this_cpu_ptr(&rcu_data);
-        if (!special.s && !rdp->deferred_qs) {
+        if (!special.s && !rdp->exp_deferred_qs) {
                 local_irq_restore(flags);
                 return;
         }
@@ -459,7 +459,7 @@ rcu_preempt_deferred_qs_irqrestore(struct task_struct *t, unsigned long flags)
         if (special.b.need_qs) {
                 rcu_qs();
                 t->rcu_read_unlock_special.b.need_qs = false;
-                if (!t->rcu_read_unlock_special.s && !rdp->deferred_qs) {
+                if (!t->rcu_read_unlock_special.s && !rdp->exp_deferred_qs) {
                         local_irq_restore(flags);
                         return;
                 }
@@ -471,7 +471,7 @@ rcu_preempt_deferred_qs_irqrestore(struct task_struct *t, unsigned long flags)
          * tasks are handled when removing the task from the
          * blocked-tasks list below.
          */
-        if (rdp->deferred_qs) {
+        if (rdp->exp_deferred_qs) {
                 rcu_report_exp_rdp(rdp);
                 if (!t->rcu_read_unlock_special.s) {
                         local_irq_restore(flags);
@@ -560,7 +560,7 @@ rcu_preempt_deferred_qs_irqrestore(struct task_struct *t, unsigned long flags)
  */
 static bool rcu_preempt_need_deferred_qs(struct task_struct *t)
 {
-        return (__this_cpu_read(rcu_data.deferred_qs) ||
+        return (__this_cpu_read(rcu_data.exp_deferred_qs) ||
                 READ_ONCE(t->rcu_read_unlock_special.s)) &&
                t->rcu_read_lock_nesting <= 0;
 }