diff options
author | Jes Sorensen <jes@trained-monkey.org> | 2006-01-09 18:59:21 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@hera.kernel.org> | 2006-01-09 18:59:21 -0500 |
commit | 794ee1baee1c26be40410233e6c20bceb2b03c08 (patch) | |
tree | 1173a5cca98ddfbc1520d2d124af6d16bf950df2 /fs/xfs/support/uuid.c | |
parent | de5097c2e73f826302cd8957c225b3725e0c7553 (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/support/uuid.c')
-rw-r--r-- | fs/xfs/support/uuid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/support/uuid.c b/fs/xfs/support/uuid.c index 70ce40914c8a..69ec4f540c3a 100644 --- a/fs/xfs/support/uuid.c +++ b/fs/xfs/support/uuid.c | |||
@@ -24,7 +24,7 @@ static uuid_t *uuid_table; | |||
24 | void | 24 | void |
25 | uuid_init(void) | 25 | uuid_init(void) |
26 | { | 26 | { |
27 | mutex_init(&uuid_monitor, MUTEX_DEFAULT, "uuid_monitor"); | 27 | mutex_init(&uuid_monitor); |
28 | } | 28 | } |
29 | 29 | ||
30 | /* | 30 | /* |
@@ -94,7 +94,7 @@ uuid_table_insert(uuid_t *uuid) | |||
94 | { | 94 | { |
95 | int i, hole; | 95 | int i, hole; |
96 | 96 | ||
97 | mutex_lock(&uuid_monitor, PVFS); | 97 | mutex_lock(&uuid_monitor); |
98 | for (i = 0, hole = -1; i < uuid_table_size; i++) { | 98 | for (i = 0, hole = -1; i < uuid_table_size; i++) { |
99 | if (uuid_is_nil(&uuid_table[i])) { | 99 | if (uuid_is_nil(&uuid_table[i])) { |
100 | hole = i; | 100 | hole = i; |
@@ -122,7 +122,7 @@ uuid_table_remove(uuid_t *uuid) | |||
122 | { | 122 | { |
123 | int i; | 123 | int i; |
124 | 124 | ||
125 | mutex_lock(&uuid_monitor, PVFS); | 125 | mutex_lock(&uuid_monitor); |
126 | for (i = 0; i < uuid_table_size; i++) { | 126 | for (i = 0; i < uuid_table_size; i++) { |
127 | if (uuid_is_nil(&uuid_table[i])) | 127 | if (uuid_is_nil(&uuid_table[i])) |
128 | continue; | 128 | continue; |