Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 377720
b: refs/heads/master
c: 696b3d8
h: refs/heads/master
v: v3
  • Loading branch information
David Teigland committed Jun 25, 2013
1 parent b7b6710 commit fc1081d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ad917e7f821855a2f223131bb6c90ca6c9240bf3
refs/heads/master: 696b3d84605e5546cbddefdc95b9099f908fd56e
9 changes: 8 additions & 1 deletion trunk/fs/dlm/lockspace.c
Original file line number Diff line number Diff line change
Expand Up @@ -883,17 +883,24 @@ int dlm_release_lockspace(void *lockspace, int force)
void dlm_stop_lockspaces(void)
{
struct dlm_ls *ls;
int count;

restart:
count = 0;
spin_lock(&lslist_lock);
list_for_each_entry(ls, &lslist, ls_list) {
if (!test_bit(LSFL_RUNNING, &ls->ls_flags))
if (!test_bit(LSFL_RUNNING, &ls->ls_flags)) {
count++;
continue;
}
spin_unlock(&lslist_lock);
log_error(ls, "no userland control daemon, stopping lockspace");
dlm_ls_stop(ls);
goto restart;
}
spin_unlock(&lslist_lock);

if (count)
log_print("dlm user daemon left %d lockspaces", count);
}

0 comments on commit fc1081d

Please sign in to comment.