Pass a lock expression to __cond_lock, like __acquire and __release
Subsystems (2)
PATCH 1/1 Pass a lock expression to __cond_lock, like __acquire and __release
Currently, __acquire and __release take a lock expression, but __cond_lock takes only a condition, not the lock acquired if the expression evaluates to true. Change __cond_lock to accept a lock expression, and change all the callers to pass in a lock expression.
Signed-off-by Josh Triplett <[email protected]>
--- include/linux/compiler.h | 4 ++-- include/linux/spinlock.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
include/linux/compiler.h +2 -2
@@ -14,7 +14,7 @@ # define __acquires(x) __attribute__((co# define __releases (x) __attribute__((context(1,0)))# define __acquire (x) __context__(1)# define __release (x) __context__(-1) -# define __cond_lock (x) ((x) ? ({ __context__(1); 1; }) : 0) +# define __cond_lock (x,c) ((c) ? ({ __acquire(x); 1; }) : 0)extern void __chk_user_ptr (void __user *);extern void __chk_io_ptr (void __iomem *);#else
@@ -31,7 +31,7 @@ # define __acquires(x)# define __releases (x)# define __acquire (x) (void)0# define __release (x) (void)0 -# define __cond_lock (x) (x) +# define __cond_lock (x,c) (c)#endif #ifdef __KERNEL__
include/linux/spinlock.h +5 -5
@@ -167,9 +167,9 @@ #define write_can_lock(rwlock) __raw_wr* regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various * methods are defined as nops in the case they are not required. */ -#define spin_trylock (lock) __cond_lock(_spin_trylock(lock)) -#define read_trylock (lock) __cond_lock(_read_trylock(lock)) -#define write_trylock (lock) __cond_lock(_write_trylock(lock)) +#define spin_trylock (lock) __cond_lock(lock, _spin_trylock(lock)) +#define read_trylock (lock) __cond_lock(lock, _read_trylock(lock)) +#define write_trylock (lock) __cond_lock(lock, _write_trylock(lock))#define spin_lock (lock) _spin_lock(lock)
@@ -236,7 +236,7 @@ #define write_unlock_irqrestore(lock, fl _write_unlock_irqrestore(lock, flags)#define write_unlock_bh (lock) _write_unlock_bh(lock) -#define spin_trylock_bh (lock) __cond_lock(_spin_trylock_bh(lock)) +#define spin_trylock_bh (lock) __cond_lock(lock, _spin_trylock_bh(lock))#define spin_trylock_irq (lock) \ ({ \
@@ -264,7 +264,7 @@ #include <asm/atomic.h>*/ extern int _atomic_dec_and_lock (atomic_t *atomic,spinlock_t *lock);#define atomic_dec_and_lock (atomic, lock) \ - __cond_lock(_atomic_dec_and_lock(atomic, lock)) + __cond_lock(lock, _atomic_dec_and_lock(atomic, lock))/** * spin_can_lock - would spin_trylock() succeed?
Signature · 1 line
1.4.1.1