[PATCH] ocfs2: dlm recovery fixes

when starting lock mastery (excepting the recovery lock) wait on any nodes
needing recovery. fix one instance where lock resources were left attached
to the recovery list after recovery completed.  ensure that the node_down
code is run uniformly regardless of which node found the dead node first.

Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
index 671d4ff222cc..6fea28318d6d 100644
--- a/fs/ocfs2/dlm/dlmlock.c
+++ b/fs/ocfs2/dlm/dlmlock.c
@@ -141,13 +141,23 @@ static enum dlm_status dlmlock_master(struct dlm_ctxt *dlm,
                                           res->lockname.len)) {
                         kick_thread = 1;
                         call_ast = 1;
+                } else {
+                        mlog(0, "%s: returning DLM_NORMAL to "
+                             "node %u for reco lock\n", dlm->name,
+                             lock->ml.node);
                 }
         } else {
                 /* for NOQUEUE request, unless we get the
                  * lock right away, return DLM_NOTQUEUED */
-                if (flags & LKM_NOQUEUE)
+                if (flags & LKM_NOQUEUE) {
                         status = DLM_NOTQUEUED;
-                else {
+                        if (dlm_is_recovery_lock(res->lockname.name,
+                                                 res->lockname.len)) {
+                                mlog(0, "%s: returning NOTQUEUED to "
+                                     "node %u for reco lock\n", dlm->name,
+                                     lock->ml.node);
+                        }
+                } else {
                         dlm_lock_get(lock);
                         list_add_tail(&lock->list, &res->blocked);
                         kick_thread = 1;