Commit a69114c2 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

ratelimit: Use nolock_ret label to save a couple of lines of code 

Create a nolock_ret label in order to start consolidating the unlocked
return paths that conditionally invoke ratelimit_state_inc_miss().

Link: https://lore.kernel.org/all/fbe93a52-365e-47fe-93a4-44a44547d601@paulmck-laptop/
Link: https://lore.kernel.org/all/20250423115409.3425-1-spasswolf@web.de/


Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Kuniyuki Iwashima <kuniyu@amazon.com>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
parent f2d0ea0f

lib/ratelimit.c

+3 −5
Original line number Diff line number Diff line
@@ -43,11 +43,8 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func) 
		WARN_ONCE(interval < 0 || burst < 0, "Negative interval (%d) or burst (%d): Uninitialized ratelimit_state structure?\n", interval, burst);

		ret = interval == 0 || burst > 0;

		if (!(READ_ONCE(rs->flags) & RATELIMIT_INITIALIZED) || (!interval && !burst) ||

		    !raw_spin_trylock_irqsave(&rs->lock, flags)) {

			if (!ret)

				ratelimit_state_inc_miss(rs);

			return ret;

		}

		    !raw_spin_trylock_irqsave(&rs->lock, flags))

			goto nolock_ret;



		/* Force re-initialization once re-enabled. */

		rs->flags &= ~RATELIMIT_INITIALIZED;
@@ -116,6 +113,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func) 
unlock_ret:

	raw_spin_unlock_irqrestore(&rs->lock, flags);



nolock_ret:

	if (!ret)

		ratelimit_state_inc_miss(rs);