git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd4: set shorter timeout
[safe/jmp/linux-2.6]
/
lib
/
rwsem-spinlock.c
diff --git
a/lib/rwsem-spinlock.c
b/lib/rwsem-spinlock.c
index
03b6097
..
9df3ca5
100644
(file)
--- a/
lib/rwsem-spinlock.c
+++ b/
lib/rwsem-spinlock.c
@@
-20,8
+20,16
@@
struct rwsem_waiter {
/*
* initialise the semaphore
*/
/*
* initialise the semaphore
*/
-void fastcall init_rwsem(struct rw_semaphore *sem)
+void __init_rwsem(struct rw_semaphore *sem, const char *name,
+ struct lock_class_key *key)
{
{
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+ /*
+ * Make sure we are not reinitializing a held semaphore:
+ */
+ debug_check_no_locks_freed((void *)sem, sizeof(*sem));
+ lockdep_init_map(&sem->dep_map, name, key, 0);
+#endif
sem->activity = 0;
spin_lock_init(&sem->wait_lock);
INIT_LIST_HEAD(&sem->wait_list);
sem->activity = 0;
spin_lock_init(&sem->wait_lock);
INIT_LIST_HEAD(&sem->wait_list);
@@
-117,7
+125,7
@@
__rwsem_wake_one_writer(struct rw_semaphore *sem)
/*
* get a read lock on the semaphore
*/
/*
* get a read lock on the semaphore
*/
-void
fastcall
__sched __down_read(struct rw_semaphore *sem)
+void __sched __down_read(struct rw_semaphore *sem)
{
struct rwsem_waiter waiter;
struct task_struct *tsk;
{
struct rwsem_waiter waiter;
struct task_struct *tsk;
@@
-160,7
+168,7
@@
void fastcall __sched __down_read(struct rw_semaphore *sem)
/*
* trylock for reading -- returns 1 if successful, 0 if contention
*/
/*
* trylock for reading -- returns 1 if successful, 0 if contention
*/
-int
fastcall
__down_read_trylock(struct rw_semaphore *sem)
+int __down_read_trylock(struct rw_semaphore *sem)
{
unsigned long flags;
int ret = 0;
{
unsigned long flags;
int ret = 0;
@@
-183,7
+191,7
@@
int fastcall __down_read_trylock(struct rw_semaphore *sem)
* get a write lock on the semaphore
* - we increment the waiting count anyway to indicate an exclusive lock
*/
* get a write lock on the semaphore
* - we increment the waiting count anyway to indicate an exclusive lock
*/
-void
fastcall __sched __down_write(struct rw_semaphore *sem
)
+void
__sched __down_write_nested(struct rw_semaphore *sem, int subclass
)
{
struct rwsem_waiter waiter;
struct task_struct *tsk;
{
struct rwsem_waiter waiter;
struct task_struct *tsk;
@@
-223,10
+231,15
@@
void fastcall __sched __down_write(struct rw_semaphore *sem)
;
}
;
}
+void __sched __down_write(struct rw_semaphore *sem)
+{
+ __down_write_nested(sem, 0);
+}
+
/*
* trylock for writing -- returns 1 if successful, 0 if contention
*/
/*
* trylock for writing -- returns 1 if successful, 0 if contention
*/
-int
fastcall
__down_write_trylock(struct rw_semaphore *sem)
+int __down_write_trylock(struct rw_semaphore *sem)
{
unsigned long flags;
int ret = 0;
{
unsigned long flags;
int ret = 0;
@@
-247,7
+260,7
@@
int fastcall __down_write_trylock(struct rw_semaphore *sem)
/*
* release a read lock on the semaphore
*/
/*
* release a read lock on the semaphore
*/
-void
fastcall
__up_read(struct rw_semaphore *sem)
+void __up_read(struct rw_semaphore *sem)
{
unsigned long flags;
{
unsigned long flags;
@@
-262,7
+275,7
@@
void fastcall __up_read(struct rw_semaphore *sem)
/*
* release a write lock on the semaphore
*/
/*
* release a write lock on the semaphore
*/
-void
fastcall
__up_write(struct rw_semaphore *sem)
+void __up_write(struct rw_semaphore *sem)
{
unsigned long flags;
{
unsigned long flags;
@@
-279,7
+292,7
@@
void fastcall __up_write(struct rw_semaphore *sem)
* downgrade a write lock into a read lock
* - just wake up any readers at the front of the queue
*/
* downgrade a write lock into a read lock
* - just wake up any readers at the front of the queue
*/
-void
fastcall
__downgrade_write(struct rw_semaphore *sem)
+void __downgrade_write(struct rw_semaphore *sem)
{
unsigned long flags;
{
unsigned long flags;
@@
-292,9
+305,10
@@
void fastcall __downgrade_write(struct rw_semaphore *sem)
spin_unlock_irqrestore(&sem->wait_lock, flags);
}
spin_unlock_irqrestore(&sem->wait_lock, flags);
}
-EXPORT_SYMBOL(init_rwsem);
+EXPORT_SYMBOL(
__
init_rwsem);
EXPORT_SYMBOL(__down_read);
EXPORT_SYMBOL(__down_read_trylock);
EXPORT_SYMBOL(__down_read);
EXPORT_SYMBOL(__down_read_trylock);
+EXPORT_SYMBOL(__down_write_nested);
EXPORT_SYMBOL(__down_write);
EXPORT_SYMBOL(__down_write_trylock);
EXPORT_SYMBOL(__up_read);
EXPORT_SYMBOL(__down_write);
EXPORT_SYMBOL(__down_write_trylock);
EXPORT_SYMBOL(__up_read);