Commit 57119c34 authored by Yong Zhang's avatar Yong Zhang Committed by Linus Torvalds

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: default avatarYong Zhang <yong.zhang@windriver.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bb1dc0ba
...@@ -40,7 +40,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func) ...@@ -40,7 +40,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func)
* the entity that is holding the lock already: * the entity that is holding the lock already:
*/ */
if (!spin_trylock_irqsave(&rs->lock, flags)) if (!spin_trylock_irqsave(&rs->lock, flags))
return 1; return 0;
if (!rs->begin) if (!rs->begin)
rs->begin = jiffies; rs->begin = jiffies;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment