leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dlm: fix locking of lockspace list in dlm_scand

Browse Source 
The dlm_scand thread needs to lock the list of lockspaces
when going through it.

Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
David Teigland 2008-08-18 14:03:25 -05:00
parent dc68c7ed36
commit c1dcf65ffc
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/dlm/dlm_internal.h
View File

@ -445,6 +445,7 @@ struct dlm_ls {
the dlm using this ls */ the dlm using this ls */
int ls_create_count; /* create/release refcount */ int ls_create_count; /* create/release refcount */
unsigned long ls_flags; /* LSFL_ */ unsigned long ls_flags; /* LSFL_ */
unsigned long ls_scan_time;
struct kobject ls_kobj; struct kobject ls_kobj;
struct dlm_rsbtable *ls_rsbtbl; struct dlm_rsbtable *ls_rsbtbl;

29
fs/dlm/lockspace.c
View File

@ -212,19 +212,41 @@ void dlm_lockspace_exit(void)
kset_unregister(dlm_kset); kset_unregister(dlm_kset);
} }
static int dlm_scand(void *data) static struct dlm_ls *find_ls_to_scan(void)
{ {
struct dlm_ls *ls; struct dlm_ls *ls;
spin_lock(&lslist_lock);
list_for_each_entry(ls, &lslist, ls_list) {
if (time_after_eq(jiffies, ls->ls_scan_time +
dlm_config.ci_scan_secs * HZ)) {
spin_unlock(&lslist_lock);
return ls;
}
}
spin_unlock(&lslist_lock);
return NULL;
}
static int dlm_scand(void *data)
{
struct dlm_ls *ls;
int timeout_jiffies = dlm_config.ci_scan_secs * HZ;
while (!kthread_should_stop()) { while (!kthread_should_stop()) {
list_for_each_entry(ls, &lslist, ls_list) { ls = find_ls_to_scan();
if (ls) {
if (dlm_lock_recovery_try(ls)) { if (dlm_lock_recovery_try(ls)) {
ls->ls_scan_time = jiffies;
dlm_scan_rsbs(ls); dlm_scan_rsbs(ls);
dlm_scan_timeout(ls); dlm_scan_timeout(ls);
dlm_unlock_recovery(ls); dlm_unlock_recovery(ls);
} else {
ls->ls_scan_time += HZ;
} }
} else {
schedule_timeout_interruptible(timeout_jiffies);
} }
schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ);
} }
return 0; return 0;
} }
@ -418,6 +440,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
ls->ls_lvblen = lvblen; ls->ls_lvblen = lvblen;
ls->ls_count = 0; ls->ls_count = 0;
ls->ls_flags = 0; ls->ls_flags = 0;
ls->ls_scan_time = jiffies;
if (flags & DLM_LSFL_TIMEWARN) if (flags & DLM_LSFL_TIMEWARN)
set_bit(LSFL_TIMEWARN, &ls->ls_flags); set_bit(LSFL_TIMEWARN, &ls->ls_flags);