1 files changed, 10 insertions, 5 deletions

diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
index 3780caf7ae0..f1a9073c083 100644
--- a/fs/dlm/recoverd.c
+++ b/fs/dlm/recoverd.c
@@ -54,7 +54,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
         unsigned long start;
         int error, neg = 0;
 
-        log_debug(ls, "dlm_recover %llx", (unsigned long long)rv->seq);
+        log_debug(ls, "dlm_recover %llu", (unsigned long long)rv->seq);
 
         mutex_lock(&ls->ls_recoverd_active);
 
@@ -84,6 +84,8 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
                 goto fail;
         }
 
+        ls->ls_recover_locks_in = 0;
+
         dlm_set_recover_status(ls, DLM_RS_NODES);
 
         error = dlm_recover_members_wait(ls);
@@ -130,7 +132,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
                  * Clear lkb's for departed nodes.
                  */
 
-                dlm_purge_locks(ls);
+                dlm_recover_purge(ls);
 
                 /*
                  * Get new master nodeid's for rsb's that were mastered on
@@ -161,6 +163,9 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
                         goto fail;
                 }
 
+                log_debug(ls, "dlm_recover_locks %u in",
+                          ls->ls_recover_locks_in);
+
                 /*
                  * Finalize state in master rsb's now that all locks can be
                  * checked.  This includes conversion resolution and lvb
@@ -225,9 +230,9 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
                 goto fail;
         }
 
-        dlm_grant_after_purge(ls);
+        dlm_recover_grant(ls);
 
-        log_debug(ls, "dlm_recover %llx generation %u done: %u ms",
+        log_debug(ls, "dlm_recover %llu generation %u done: %u ms",
                   (unsigned long long)rv->seq, ls->ls_generation,
                   jiffies_to_msecs(jiffies - start));
         mutex_unlock(&ls->ls_recoverd_active);
@@ -237,7 +242,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
  fail:
         dlm_release_root_list(ls);
-        log_debug(ls, "dlm_recover %llx error %d",
+        log_debug(ls, "dlm_recover %llu error %d",
                   (unsigned long long)rv->seq, error);
         mutex_unlock(&ls->ls_recoverd_active);
         return error;