2012-10-17 14:54:29

by Wei Yongjun

Subject: [PATCH] CRIS: locking: fix the return value of arch_read_trylock()

From: Wei Yongjun <[email protected]>

arch_write_trylock() should return 'ret' instead of always
return 1.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <[email protected]>
---
arch/cris/include/arch-v32/arch/spinlock.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/cris/include/arch-v32/arch/spinlock.h b/arch/cris/include/arch-v32/arch/spinlock.h
index f171a66..f132755 100644
--- a/arch/cris/include/arch-v32/arch/spinlock.h
+++ b/arch/cris/include/arch-v32/arch/spinlock.h
@@ -118,7 +118,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)
ret = 1;
}
arch_spin_unlock(&rw->slock);
- return 1;
+ return ret;
}

#define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)

2012-10-19 08:35:34

by Jesper Nilsson

Subject: Re: [PATCH] CRIS: locking: fix the return value of arch_read_trylock()

On Wed, Oct 17, 2012 at 10:54:27PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> arch_write_trylock() should return 'ret' instead of always
> return 1.
>
> dpatch engine is used to auto generate this patch.
> (https://github.com/weiyj/dpatch)

I've taken this into the CRIS-tree, thanks!

> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> arch/cris/include/arch-v32/arch/spinlock.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/cris/include/arch-v32/arch/spinlock.h b/arch/cris/include/arch-v32/arch/spinlock.h
> index f171a66..f132755 100644
> --- a/arch/cris/include/arch-v32/arch/spinlock.h
> +++ b/arch/cris/include/arch-v32/arch/spinlock.h
> @@ -118,7 +118,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)
> ret = 1;
> }
> arch_spin_unlock(&rw->slock);
> - return 1;
> + return ret;
> }
>
> #define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]