hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Arjan van de Ven 2006-01-13 21:54:23 -08:00 committed by Mark Fasheh
parent e2faea4ce3
commit c74ec2f77a
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ocfs2/journal.c
View File

@ -1072,10 +1072,10 @@ restart:
NULL); NULL);
bail: bail:
down(&osb->recovery_lock); mutex_lock(&osb->recovery_lock);
if (!status && if (!status &&
!ocfs2_node_map_is_empty(osb, &osb->recovery_map)) { !ocfs2_node_map_is_empty(osb, &osb->recovery_map)) {
up(&osb->recovery_lock); mutex_unlock(&osb->recovery_lock);
goto restart; goto restart;
} }
@ -1083,7 +1083,7 @@ bail:
mb(); /* sync with ocfs2_recovery_thread_running */ mb(); /* sync with ocfs2_recovery_thread_running */
wake_up(&osb->recovery_event); wake_up(&osb->recovery_event);
up(&osb->recovery_lock); mutex_unlock(&osb->recovery_lock);
mlog_exit(status); mlog_exit(status);
/* no one is callint kthread_stop() for us so the kthread() api /* 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)
mlog_entry("(node_num=%d, osb->node_num = %d)\n", mlog_entry("(node_num=%d, osb->node_num = %d)\n",
node_num, osb->node_num); node_num, osb->node_num);
down(&osb->recovery_lock); mutex_lock(&osb->recovery_lock);
if (osb->disable_recovery) if (osb->disable_recovery)
goto out; goto out;
@ -1120,7 +1120,7 @@ void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num)
} }
out: out:
up(&osb->recovery_lock); mutex_unlock(&osb->recovery_lock);
wake_up(&osb->recovery_event); wake_up(&osb->recovery_event);
mlog_exit_void(); mlog_exit_void();

3
fs/ocfs2/ocfs2.h
View File

@ -33,6 +33,7 @@
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/mutex.h>
#include "cluster/nodemanager.h" #include "cluster/nodemanager.h"
#include "cluster/heartbeat.h" #include "cluster/heartbeat.h"
@ -233,7 +234,7 @@ struct ocfs2_super
struct proc_dir_entry *proc_sub_dir; /* points to /proc/fs/ocfs2/<maj_min> */ struct proc_dir_entry *proc_sub_dir; /* points to /proc/fs/ocfs2/<maj_min> */
atomic_t vol_state; atomic_t vol_state;
struct semaphore recovery_lock; struct mutex recovery_lock;
struct task_struct *recovery_thread_task; struct task_struct *recovery_thread_task;
int disable_recovery; int disable_recovery;
wait_queue_head_t checkpoint_event; wait_queue_head_t checkpoint_event;

6
fs/ocfs2/super.c
View File

@ -1137,9 +1137,9 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
/* disable any new recovery threads and wait for any currently /* disable any new recovery threads and wait for any currently
* running ones to exit. Do this before setting the vol_state. */ * running ones to exit. Do this before setting the vol_state. */
down(&osb->recovery_lock); mutex_lock(&osb->recovery_lock);
osb->disable_recovery = 1; osb->disable_recovery = 1;
up(&osb->recovery_lock); mutex_unlock(&osb->recovery_lock);
wait_event(osb->recovery_event, !ocfs2_recovery_thread_running(osb)); wait_event(osb->recovery_event, !ocfs2_recovery_thread_running(osb));
/* At this point, we know that no more recovery threads can be /* At this point, we know that no more recovery threads can be
@ -1283,7 +1283,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
snprintf(osb->dev_str, sizeof(osb->dev_str), "%u,%u", snprintf(osb->dev_str, sizeof(osb->dev_str), "%u,%u",
MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev)); MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev));
init_MUTEX(&osb->recovery_lock); mutex_init(&osb->recovery_lock);
osb->disable_recovery = 0; osb->disable_recovery = 0;
osb->recovery_thread_task = NULL; osb->recovery_thread_task = NULL;