srcu: Standardize srcu_data pointers to "sdp" and similar

This commit changes a few "cpuc" variables to "sdp" to align with usage
elsewhere.

[ paulmck: Apply Neeraj Upadhyay feedback. ]

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: <bpf@vger.kernel.org>
Reviewed-by: Neeraj Upadhyay <Neeraj.Upadhyay@amd.com>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>

diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index 9774bc500de51d8b8b686e5745124add03b86da9..b85da944d794a5cb8b850c7eabdaa6fa5a97ee26 100644 (file)
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -438,9 +438,9 @@ static unsigned long srcu_readers_lock_idx(struct srcu_struct *ssp, int idx)
        unsigned long sum = 0;
 
        for_each_possible_cpu(cpu) {
-               struct srcu_data *cpuc = per_cpu_ptr(ssp->sda, cpu);
+               struct srcu_data *sdp = per_cpu_ptr(ssp->sda, cpu);
 
-               sum += atomic_long_read(&cpuc->srcu_lock_count[idx]);
+               sum += atomic_long_read(&sdp->srcu_lock_count[idx]);
        }
        return sum;
 }
@@ -456,11 +456,11 @@ static unsigned long srcu_readers_unlock_idx(struct srcu_struct *ssp, int idx)
        unsigned long sum = 0;
 
        for_each_possible_cpu(cpu) {
-               struct srcu_data *cpuc = per_cpu_ptr(ssp->sda, cpu);
+               struct srcu_data *sdp = per_cpu_ptr(ssp->sda, cpu);
 
-               sum += atomic_long_read(&cpuc->srcu_unlock_count[idx]);
+               sum += atomic_long_read(&sdp->srcu_unlock_count[idx]);
                if (IS_ENABLED(CONFIG_PROVE_RCU))
-                       mask = mask | READ_ONCE(cpuc->srcu_reader_flavor);
+                       mask = mask | READ_ONCE(sdp->srcu_reader_flavor);
        }
        WARN_ONCE(IS_ENABLED(CONFIG_PROVE_RCU) && (mask & (mask - 1)),
                  "Mixed NMI-safe readers for srcu_struct at %ps.\n", ssp);
@@ -564,12 +564,12 @@ static bool srcu_readers_active(struct srcu_struct *ssp)
        unsigned long sum = 0;
 
        for_each_possible_cpu(cpu) {
-               struct srcu_data *cpuc = per_cpu_ptr(ssp->sda, cpu);
+               struct srcu_data *sdp = per_cpu_ptr(ssp->sda, cpu);
 
-               sum += atomic_long_read(&cpuc->srcu_lock_count[0]);
-               sum += atomic_long_read(&cpuc->srcu_lock_count[1]);
-               sum -= atomic_long_read(&cpuc->srcu_unlock_count[0]);
-               sum -= atomic_long_read(&cpuc->srcu_unlock_count[1]);
+               sum += atomic_long_read(&sdp->srcu_lock_count[0]);
+               sum += atomic_long_read(&sdp->srcu_lock_count[1]);
+               sum -= atomic_long_read(&sdp->srcu_unlock_count[0]);
+               sum -= atomic_long_read(&sdp->srcu_unlock_count[1]);
        }
        return sum;
 }