From fc1081dc63b31e0deed46c8710576f9ad3ee8326 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 25 Jun 2013 12:48:01 -0500 Subject: [PATCH] --- yaml --- r: 377720 b: refs/heads/master c: 696b3d84605e5546cbddefdc95b9099f908fd56e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/dlm/lockspace.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a931c13a1df9..23f430030025 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad917e7f821855a2f223131bb6c90ca6c9240bf3 +refs/heads/master: 696b3d84605e5546cbddefdc95b9099f908fd56e diff --git a/trunk/fs/dlm/lockspace.c b/trunk/fs/dlm/lockspace.c index 3ca79d3253b9..88556dc0458e 100644 --- a/trunk/fs/dlm/lockspace.c +++ b/trunk/fs/dlm/lockspace.c @@ -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); }