diff options
author | Arjan van de Ven <arjan@infradead.org> | 2006-03-23 06:00:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 10:38:12 -0500 |
commit | 2c68ee754c40099c59828e59618a54726f76126a (patch) | |
tree | b656a0caa9b31749b5b6f9a3f7a1f3ffc482552c /include | |
parent | f24075bd0c1cd1cc2cf86d394f960aa0401de573 (diff) |
[PATCH] sem2mutex: jbd, j_checkpoint_mutex
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/jbd.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 41ee79962bb..2ccbfb6340b 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/journal-head.h> | 28 | #include <linux/journal-head.h> |
29 | #include <linux/stddef.h> | 29 | #include <linux/stddef.h> |
30 | #include <linux/bit_spinlock.h> | 30 | #include <linux/bit_spinlock.h> |
31 | #include <linux/mutex.h> | ||
31 | #include <asm/semaphore.h> | 32 | #include <asm/semaphore.h> |
32 | #endif | 33 | #endif |
33 | 34 | ||
@@ -575,7 +576,7 @@ struct transaction_s | |||
575 | * @j_wait_checkpoint: Wait queue to trigger checkpointing | 576 | * @j_wait_checkpoint: Wait queue to trigger checkpointing |
576 | * @j_wait_commit: Wait queue to trigger commit | 577 | * @j_wait_commit: Wait queue to trigger commit |
577 | * @j_wait_updates: Wait queue to wait for updates to complete | 578 | * @j_wait_updates: Wait queue to wait for updates to complete |
578 | * @j_checkpoint_sem: Semaphore for locking against concurrent checkpoints | 579 | * @j_checkpoint_mutex: Mutex for locking against concurrent checkpoints |
579 | * @j_head: Journal head - identifies the first unused block in the journal | 580 | * @j_head: Journal head - identifies the first unused block in the journal |
580 | * @j_tail: Journal tail - identifies the oldest still-used block in the | 581 | * @j_tail: Journal tail - identifies the oldest still-used block in the |
581 | * journal. | 582 | * journal. |
@@ -645,7 +646,7 @@ struct journal_s | |||
645 | int j_barrier_count; | 646 | int j_barrier_count; |
646 | 647 | ||
647 | /* The barrier lock itself */ | 648 | /* The barrier lock itself */ |
648 | struct semaphore j_barrier; | 649 | struct mutex j_barrier; |
649 | 650 | ||
650 | /* | 651 | /* |
651 | * Transactions: The current running transaction... | 652 | * Transactions: The current running transaction... |
@@ -687,7 +688,7 @@ struct journal_s | |||
687 | wait_queue_head_t j_wait_updates; | 688 | wait_queue_head_t j_wait_updates; |
688 | 689 | ||
689 | /* Semaphore for locking against concurrent checkpoints */ | 690 | /* Semaphore for locking against concurrent checkpoints */ |
690 | struct semaphore j_checkpoint_sem; | 691 | struct mutex j_checkpoint_mutex; |
691 | 692 | ||
692 | /* | 693 | /* |
693 | * Journal head: identifies the first unused block in the journal. | 694 | * Journal head: identifies the first unused block in the journal. |