rcu: Remove redundant debug_locks check in rcu_read_lock_sched_held() (9147089b) · Commits · 戴 / test

The debug_locks flag can never be true at the end of rcu_read_lock_sched_held() because it is already checked by the earlier call todebug_lockdep_rcu_enabled(). This commit therefore removes this redundant check. Signed-off-by:

Joel Fernandes (Google) <joel@joelfernandes.org> Signed-off-by:

Paul E. McKenney <paulmck@linux.ibm.com>

kernel/rcu/update.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -93,17 +93,13 @@ module_param(rcu_normal_after_boot, int, 0);
		*/
		int rcu_read_lock_sched_held(void)
		{
		int lockdep_opinion = 0;

		if (!debug_lockdep_rcu_enabled())
		return 1;
		if (!rcu_is_watching())
		return 0;
		if (!rcu_lockdep_current_cpu_online())
		return 0;
		if (debug_locks)
		lockdep_opinion = lock_is_held(&rcu_sched_lock_map);
		return lockdep_opinion \|\| !preemptible();
		return lock_is_held(&rcu_sched_lock_map) \|\| !preemptible();
		}
		EXPORT_SYMBOL(rcu_read_lock_sched_held);
		#endif

Admin message