Re: [RFC PATCH 3/3] ratelimit: Fix return value when fail to getlock

[Andrew Morton]

On Wed, 17 Mar 2010 10:58:44 +0800
Yong Zhang <yong.zhang@xxxxxxxxxxxxx> wrote:

> >From log of commit edaac8e3167501cda336231d00611bf59c164346,
> It seems that we want to suppress the callback when trylock
> fails.
> 
> Signed-off-by: Yong Zhang <yong.zhang@xxxxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxx>
> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx>
> ---
>  lib/ratelimit.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lib/ratelimit.c b/lib/ratelimit.c
> index 29a10b3..358638f 100644
> --- a/lib/ratelimit.c
> +++ b/lib/ratelimit.c
> @@ -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;

Looks right to me.  I queued all three patches for 2.6.34.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/