aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/journal.c
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2006-01-14 00:54:23 -0500
committerMark Fasheh <mark.fasheh@oracle.com>2006-02-03 16:47:21 -0500
commitc74ec2f77a7763a4a56c6cb13ecab961e1bbb456 (patch)
treeaa1ce70fae2b098a4e452fd065581268ba8a6d5c /fs/ocfs2/journal.c
parente2faea4ce340f199c1957986c4c3dc2de76f5746 (diff)
[PATCH] ocfs2: Semaphore to mutex conversion.
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: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/journal.c')
-rw-r--r--fs/ocfs2/journal.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 65bd69d1c710..ccabed9a0aad 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1072,10 +1072,10 @@ restart:
1072 NULL); 1072 NULL);
1073 1073
1074bail: 1074bail:
1075 down(&osb->recovery_lock); 1075 mutex_lock(&osb->recovery_lock);
1076 if (!status && 1076 if (!status &&
1077 !ocfs2_node_map_is_empty(osb, &osb->recovery_map)) { 1077 !ocfs2_node_map_is_empty(osb, &osb->recovery_map)) {
1078 up(&osb->recovery_lock); 1078 mutex_unlock(&osb->recovery_lock);
1079 goto restart; 1079 goto restart;
1080 } 1080 }
1081 1081
@@ -1083,7 +1083,7 @@ bail:
1083 mb(); /* sync with ocfs2_recovery_thread_running */ 1083 mb(); /* sync with ocfs2_recovery_thread_running */
1084 wake_up(&osb->recovery_event); 1084 wake_up(&osb->recovery_event);
1085 1085
1086 up(&osb->recovery_lock); 1086 mutex_unlock(&osb->recovery_lock);
1087 1087
1088 mlog_exit(status); 1088 mlog_exit(status);
1089 /* no one is callint kthread_stop() for us so the kthread() api 1089 /* no one is callint kthread_stop() for us so the kthread() api
@@ -1098,7 +1098,7 @@ void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num)
1098 mlog_entry("(node_num=%d, osb->node_num = %d)\n", 1098 mlog_entry("(node_num=%d, osb->node_num = %d)\n",
1099 node_num, osb->node_num); 1099 node_num, osb->node_num);
1100 1100
1101 down(&osb->recovery_lock); 1101 mutex_lock(&osb->recovery_lock);
1102 if (osb->disable_recovery) 1102 if (osb->disable_recovery)
1103 goto out; 1103 goto out;
1104 1104
@@ -1120,7 +1120,7 @@ void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num)
1120 } 1120 }
1121 1121
1122out: 1122out:
1123 up(&osb->recovery_lock); 1123 mutex_unlock(&osb->recovery_lock);
1124 wake_up(&osb->recovery_event); 1124 wake_up(&osb->recovery_event);
1125 1125
1126 mlog_exit_void(); 1126 mlog_exit_void();