1 files changed, 20 insertions, 16 deletions

diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 7e38a072d720..7540a492eaba 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -188,7 +188,7 @@ struct dlm_lock_resource * __dlm_lookup_lockres_full(struct dlm_ctxt *dlm,
         struct hlist_head *bucket;
         struct hlist_node *list;
 
-        mlog_entry("%.*s\n", len, name);
+        mlog(0, "%.*s\n", len, name);
 
         assert_spin_locked(&dlm->spinlock);
 
@@ -222,7 +222,7 @@ struct dlm_lock_resource * __dlm_lookup_lockres(struct dlm_ctxt *dlm,
 {
         struct dlm_lock_resource *res = NULL;
 
-        mlog_entry("%.*s\n", len, name);
+        mlog(0, "%.*s\n", len, name);
 
         assert_spin_locked(&dlm->spinlock);
 
@@ -531,7 +531,7 @@ static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data,
         unsigned int node;
         struct dlm_exit_domain *exit_msg = (struct dlm_exit_domain *) msg->buf;
 
-        mlog_entry("%p %u %p", msg, len, data);
+        mlog(0, "%p %u %p", msg, len, data);
 
         if (!dlm_grab(dlm))
                 return 0;
@@ -926,9 +926,10 @@ static int dlm_assert_joined_handler(struct o2net_msg *msg, u32 len, void *data,
 }
 
 static int dlm_match_regions(struct dlm_ctxt *dlm,
-                             struct dlm_query_region *qr)
+                             struct dlm_query_region *qr,
+                             char *local, int locallen)
 {
-        char *local = NULL, *remote = qr->qr_regions;
+        char *remote = qr->qr_regions;
         char *l, *r;
         int localnr, i, j, foundit;
         int status = 0;
@@ -957,13 +958,8 @@ static int dlm_match_regions(struct dlm_ctxt *dlm,
                 r += O2HB_MAX_REGION_NAME_LEN;
         }
 
-        local = kmalloc(sizeof(qr->qr_regions), GFP_ATOMIC);
-        if (!local) {
-                status = -ENOMEM;
-                goto bail;
-        }
-
-        localnr = o2hb_get_all_regions(local, O2NM_MAX_REGIONS);
+        localnr = min(O2NM_MAX_REGIONS, locallen/O2HB_MAX_REGION_NAME_LEN);
+        localnr = o2hb_get_all_regions(local, (u8)localnr);
 
         /* compare local regions with remote */
         l = local;
@@ -1012,8 +1008,6 @@ static int dlm_match_regions(struct dlm_ctxt *dlm,
         }
 
 bail:
-        kfree(local);
-
         return status;
 }
 
@@ -1075,6 +1069,7 @@ static int dlm_query_region_handler(struct o2net_msg *msg, u32 len,
 {
         struct dlm_query_region *qr;
         struct dlm_ctxt *dlm = NULL;
+        char *local = NULL;
         int status = 0;
         int locked = 0;
 
@@ -1083,6 +1078,13 @@ static int dlm_query_region_handler(struct o2net_msg *msg, u32 len,
         mlog(0, "Node %u queries hb regions on domain %s\n", qr->qr_node,
              qr->qr_domain);
 
+        /* buffer used in dlm_mast_regions() */
+        local = kmalloc(sizeof(qr->qr_regions), GFP_KERNEL);
+        if (!local) {
+                status = -ENOMEM;
+                goto bail;
+        }
+
         status = -EINVAL;
 
         spin_lock(&dlm_domain_lock);
@@ -1112,13 +1114,15 @@ static int dlm_query_region_handler(struct o2net_msg *msg, u32 len,
                 goto bail;
         }
 
-        status = dlm_match_regions(dlm, qr);
+        status = dlm_match_regions(dlm, qr, local, sizeof(qr->qr_regions));
 
 bail:
         if (locked)
                 spin_unlock(&dlm->spinlock);
         spin_unlock(&dlm_domain_lock);
 
+        kfree(local);
+
         return status;
 }
 
@@ -1553,7 +1557,7 @@ static int dlm_try_to_join_domain(struct dlm_ctxt *dlm)
         struct domain_join_ctxt *ctxt;
         enum dlm_query_join_response_code response = JOIN_DISALLOW;
 
-        mlog_entry("%p", dlm);
+        mlog(0, "%p", dlm);
 
         ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
         if (!ctxt) {