[Ocfs2-commits] zab commits r2447 - trunk/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: zab
Signed-off-by: mfasheh
Date: 2005-06-29 17:47:38 -0500 (Wed, 29 Jun 2005)
New Revision: 2447

Modified:
   trunk/fs/ocfs2/dlm/dlmdomain.c
Log:
o teach join to use the new hb helper for testing if a node is heartbeating

Signed-off-by: mfasheh


Modified: trunk/fs/ocfs2/dlm/dlmdomain.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmdomain.c	2005-06-29 21:21:17 UTC (rev 2446)
+++ trunk/fs/ocfs2/dlm/dlmdomain.c	2005-06-29 22:47:38 UTC (rev 2447)
@@ -551,7 +551,6 @@
 	dlm_query_join_request *query;
 	enum dlm_query_join_response response;
 	dlm_ctxt *dlm = NULL;
-	unsigned long hb_node_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
 
 	query = (dlm_query_join_request *) msg->buf;
 	dlm_query_join_request_to_host(query);
@@ -564,8 +563,7 @@
 	 * to back off and try again.  This gives heartbeat a chance
 	 * to catch up.
 	 */
-	o2hb_fill_node_map(hb_node_map, sizeof(hb_node_map));
-	if (!test_bit(query->node_idx, hb_node_map)) {
+	if (!o2hb_check_node_heartbeating(query->node_idx)) {
 		mlog(0, "node %u is not in our live map yet\n",
 		     query->node_idx);