Commit 57119c34 authored Apr 06, 2010 by Yong Zhang Committed by Linus Torvalds Apr 07, 2010

ratelimit: fix the return value when __ratelimit() fails to acquire the lock

The log of commit edaac8e3 ("ratelimit:
Fix/allow use in atomic contexts"), indicates that we want to suppress the
callback when the trylock fails.

Signed-off-by: Yong Zhang <yong.zhang@windriver.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent bb1dc0ba

lib/ratelimit.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ int ___ratelimit(struct ratelimit_state rs, const char func)
		* the entity that is holding the lock already:
		*/
		if (!spin_trylock_irqsave(&rs->lock, flags))
		return 1;
		return 0;

		if (!rs->begin)
		rs->begin = jiffies;