OSDN Git Service

[PARISC] More useful readwrite lock helpers
authorKyle McMartin <kyle@parisc-linux.org>
Sat, 25 Mar 2006 04:22:02 +0000 (21:22 -0700)
committerKyle McMartin <kyle@hera.kernel.org>
Thu, 30 Mar 2006 17:48:53 +0000 (17:48 +0000)
spinlock.c needs _can_lock helpers. Rewrite _is_locked helpers to be
_can_lock helpers.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
include/asm-parisc/spinlock.h

index 16c2ac0..a93960e 100644 (file)
@@ -134,14 +134,22 @@ static  __inline__ int __raw_write_trylock(raw_rwlock_t *rw)
        return 1;
 }
 
-static __inline__ int __raw_is_read_locked(raw_rwlock_t *rw)
+/*
+ * read_can_lock - would read_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+static __inline__ int __raw_read_can_lock(raw_rwlock_t *rw)
 {
-       return rw->counter > 0;
+       return rw->counter >= 0;
 }
 
-static __inline__ int __raw_is_write_locked(raw_rwlock_t *rw)
+/*
+ * write_can_lock - would write_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+static __inline__ int __raw_write_can_lock(raw_rwlock_t *rw)
 {
-       return rw->counter < 0;
+       return !rw->counter;
 }
 
 #endif /* __ASM_SPINLOCK_H */