rcu: Remove unused variable rcu_perf_writer_state (b3ffb206) · Commits · 戴 / test

kernel/rcu/rcuperf.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -109,15 +109,6 @@ static unsigned long b_rcu_perf_writer_started;
		static unsigned long b_rcu_perf_writer_finished;
		static DEFINE_PER_CPU(atomic_t, n_async_inflight);

		static int rcu_perf_writer_state;
		#define RTWS_INIT 0
		#define RTWS_ASYNC 1
		#define RTWS_BARRIER 2
		#define RTWS_EXP_SYNC 3
		#define RTWS_SYNC 4
		#define RTWS_IDLE 5
		#define RTWS_STOPPING 6

		#define MAX_MEAS 10000
		#define MIN_MEAS 100

		@@ -404,25 +395,20 @@ retry:
		if (!rhp)
		rhp = kmalloc(sizeof(*rhp), GFP_KERNEL);
		if (rhp && atomic_read(this_cpu_ptr(&n_async_inflight)) < gp_async_max) {
		rcu_perf_writer_state = RTWS_ASYNC;
		atomic_inc(this_cpu_ptr(&n_async_inflight));
		cur_ops->async(rhp, rcu_perf_async_cb);
		rhp = NULL;
		} else if (!kthread_should_stop()) {
		rcu_perf_writer_state = RTWS_BARRIER;
		cur_ops->gp_barrier();
		goto retry;
		} else {
		kfree(rhp); /* Because we are stopping. */
		}
		} else if (gp_exp) {
		rcu_perf_writer_state = RTWS_EXP_SYNC;
		cur_ops->exp_sync();
		} else {
		rcu_perf_writer_state = RTWS_SYNC;
		cur_ops->sync();
		}
		rcu_perf_writer_state = RTWS_IDLE;
		t = ktime_get_mono_fast_ns();
		wdp = t - wdp;
		i_max = i;
		@@ -463,10 +449,8 @@ retry:
		rcu_perf_wait_shutdown();
		} while (!torture_must_stop());
		if (gp_async) {
		rcu_perf_writer_state = RTWS_BARRIER;
		cur_ops->gp_barrier();
		}
		rcu_perf_writer_state = RTWS_STOPPING;
		writer_n_durations[me] = i_max;
		torture_kthread_stopping("rcu_perf_writer");
		return 0;