aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/mutex.h
diff options
context:
space:
mode:
authorJes Sorensen <jes@trained-monkey.org>2006-01-09 18:59:21 -0500
committerIngo Molnar <mingo@hera.kernel.org>2006-01-09 18:59:21 -0500
commit794ee1baee1c26be40410233e6c20bceb2b03c08 (patch)
tree1173a5cca98ddfbc1520d2d124af6d16bf950df2 /fs/xfs/linux-2.6/mutex.h
parentde5097c2e73f826302cd8957c225b3725e0c7553 (diff)
[PATCH] mutex subsystem, semaphore to mutex: XFS
This patch switches XFS over to use the new mutex code directly as opposed to the previous workaround patch I posted earlier that avoided the namespace clash by forcing it back to semaphores. This falls in the 'works for me<tm>' category. Signed-off-by: Jes Sorensen <jes@trained-monkey.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/xfs/linux-2.6/mutex.h')
-rw-r--r--fs/xfs/linux-2.6/mutex.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/xfs/linux-2.6/mutex.h b/fs/xfs/linux-2.6/mutex.h
index ce773d89a923..d3369b6ca168 100644
--- a/fs/xfs/linux-2.6/mutex.h
+++ b/fs/xfs/linux-2.6/mutex.h
@@ -19,7 +19,7 @@
19#define __XFS_SUPPORT_MUTEX_H__ 19#define __XFS_SUPPORT_MUTEX_H__
20 20
21#include <linux/spinlock.h> 21#include <linux/spinlock.h>
22#include <asm/semaphore.h> 22#include <linux/mutex.h>
23 23
24/* 24/*
25 * Map the mutex'es from IRIX to Linux semaphores. 25 * Map the mutex'es from IRIX to Linux semaphores.
@@ -28,12 +28,8 @@
28 * callers. 28 * callers.
29 */ 29 */
30#define MUTEX_DEFAULT 0x0 30#define MUTEX_DEFAULT 0x0
31typedef struct semaphore mutex_t;
32 31
33#define mutex_init(lock, type, name) sema_init(lock, 1) 32typedef struct mutex mutex_t;
34#define mutex_destroy(lock) sema_init(lock, -99) 33//#define mutex_destroy(lock) do{}while(0)
35#define mutex_lock(lock, num) down(lock)
36#define mutex_trylock(lock) (down_trylock(lock) ? 0 : 1)
37#define mutex_unlock(lock) up(lock)
38 34
39#endif /* __XFS_SUPPORT_MUTEX_H__ */ 35#endif /* __XFS_SUPPORT_MUTEX_H__ */