1 files changed, 12 insertions, 1 deletions

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 773bd32bfd8c..0b5adca1b178 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -787,6 +787,7 @@ static int dlm_request_all_locks(struct dlm_ctxt *dlm, u8 request_from,
 {
         struct dlm_lock_request lr;
         int ret;
+        int status;
 
         mlog(0, "\n");
 
@@ -800,13 +801,15 @@ static int dlm_request_all_locks(struct dlm_ctxt *dlm, u8 request_from,
 
         // send message
         ret = o2net_send_message(DLM_LOCK_REQUEST_MSG, dlm->key,
-                                 &lr, sizeof(lr), request_from, NULL);
+                                 &lr, sizeof(lr), request_from, &status);
 
         /* negative status is handled by caller */
         if (ret < 0)
                 mlog(ML_ERROR, "%s: Error %d send LOCK_REQUEST to node %u "
                      "to recover dead node %u\n", dlm->name, ret,
                      request_from, dead_node);
+        else
+                ret = status;
         // return from here, then
         // sleep until all received or error
         return ret;
@@ -2328,6 +2331,14 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node)
                         } else if (res->owner == dlm->node_num) {
                                 dlm_free_dead_locks(dlm, res, dead_node);
                                 __dlm_lockres_calc_usage(dlm, res);
+                        } else if (res->owner == DLM_LOCK_RES_OWNER_UNKNOWN) {
+                                if (test_bit(dead_node, res->refmap)) {
+                                        mlog(0, "%s:%.*s: dead node %u had a ref, but had "
+                                                "no locks and had not purged before dying\n",
+                                                dlm->name, res->lockname.len,
+                                                res->lockname.name, dead_node);
+                                        dlm_lockres_clear_refmap_bit(dlm, res, dead_node);
+                                }
                         }
                         spin_unlock(&res->spinlock);
                 }