1 files changed, 23 insertions, 21 deletions

diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 3fcf205ee900..02d315fef432 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -839,7 +839,7 @@ static int dlm_query_join_handler(struct o2net_msg *msg, u32 len, void *data,
          * to back off and try again.  This gives heartbeat a chance
          * to catch up.
          */
-        if (!o2hb_check_node_heartbeating(query->node_idx)) {
+        if (!o2hb_check_node_heartbeating_no_sem(query->node_idx)) {
                 mlog(0, "node %u is not in our live map yet\n",
                      query->node_idx);
 
@@ -1975,24 +1975,22 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
 
         dlm = kzalloc(sizeof(*dlm), GFP_KERNEL);
         if (!dlm) {
-                mlog_errno(-ENOMEM);
+                ret = -ENOMEM;
+                mlog_errno(ret);
                 goto leave;
         }
 
         dlm->name = kstrdup(domain, GFP_KERNEL);
         if (dlm->name == NULL) {
-                mlog_errno(-ENOMEM);
-                kfree(dlm);
-                dlm = NULL;
+                ret = -ENOMEM;
+                mlog_errno(ret);
                 goto leave;
         }
 
         dlm->lockres_hash = (struct hlist_head **)dlm_alloc_pagevec(DLM_HASH_PAGES);
         if (!dlm->lockres_hash) {
-                mlog_errno(-ENOMEM);
-                kfree(dlm->name);
-                kfree(dlm);
-                dlm = NULL;
+                ret = -ENOMEM;
+                mlog_errno(ret);
                 goto leave;
         }
 
@@ -2002,11 +2000,8 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
         dlm->master_hash = (struct hlist_head **)
                                 dlm_alloc_pagevec(DLM_HASH_PAGES);
         if (!dlm->master_hash) {
-                mlog_errno(-ENOMEM);
-                dlm_free_pagevec((void **)dlm->lockres_hash, DLM_HASH_PAGES);
-                kfree(dlm->name);
-                kfree(dlm);
-                dlm = NULL;
+                ret = -ENOMEM;
+                mlog_errno(ret);
                 goto leave;
         }
 
@@ -2017,14 +2012,8 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
         dlm->node_num = o2nm_this_node();
 
         ret = dlm_create_debugfs_subroot(dlm);
-        if (ret < 0) {
-                dlm_free_pagevec((void **)dlm->master_hash, DLM_HASH_PAGES);
-                dlm_free_pagevec((void **)dlm->lockres_hash, DLM_HASH_PAGES);
-                kfree(dlm->name);
-                kfree(dlm);
-                dlm = NULL;
+        if (ret < 0)
                 goto leave;
-        }
 
         spin_lock_init(&dlm->spinlock);
         spin_lock_init(&dlm->master_lock);
@@ -2085,6 +2074,19 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
                   atomic_read(&dlm->dlm_refs.refcount));
 
 leave:
+        if (ret < 0 && dlm) {
+                if (dlm->master_hash)
+                        dlm_free_pagevec((void **)dlm->master_hash,
+                                        DLM_HASH_PAGES);
+
+                if (dlm->lockres_hash)
+                        dlm_free_pagevec((void **)dlm->lockres_hash,
+                                        DLM_HASH_PAGES);
+
+                kfree(dlm->name);
+                kfree(dlm);
+                dlm = NULL;
+        }
         return dlm;
 }