[Ocfs2-commits] zab commits r1775 - trunk/cluster

[svn-commits at oss.oracle.com]

Author: zab
Date: 2005-01-14 18:51:41 -0600 (Fri, 14 Jan 2005)
New Revision: 1775

Modified:
   trunk/cluster/dlmmaster.c
   trunk/cluster/dlmmod.c
   trunk/cluster/dlmmod.h
Log:
o be sure to use 'unsigned long' with the _bit() apis


Modified: trunk/cluster/dlmmaster.c
===================================================================
--- trunk/cluster/dlmmaster.c	2005-01-14 23:59:42 UTC (rev 1774)
+++ trunk/cluster/dlmmaster.c	2005-01-15 00:51:41 UTC (rev 1775)
@@ -419,7 +419,8 @@
 			break;
 		}
 		if (ret == -ETIMEDOUT) {
-			dlmprintk("timed out during lock mastery: vote_map=%08x, response_map=%08x\n",
+			dlmprintk("timed out during lock mastery: "
+				  "vote_map=%0lx, response_map=%0lx\n",
 				  mle->vote_map[0], mle->response_map[0]);
 			continue;
 		}

Modified: trunk/cluster/dlmmod.c
===================================================================
--- trunk/cluster/dlmmod.c	2005-01-14 23:59:42 UTC (rev 1774)
+++ trunk/cluster/dlmmod.c	2005-01-15 00:51:41 UTC (rev 1775)
@@ -1160,10 +1160,13 @@
 	tmpret = hb_fill_node_map(group, dlm->node_map, NM_MAX_NODES);
 	if (tmpret)
 		goto error;
-	dlmprintk("hb_fill_node_map returned node map: %08x%08x%08x%08x%08x%08x%08x%08x\n",
-		  dlm->node_map[0], dlm->node_map[1], dlm->node_map[2], dlm->node_map[3],
-		  dlm->node_map[4], dlm->node_map[5], dlm->node_map[6], dlm->node_map[7]);
 
+	dlmprintk("hb_fill_node_map returned node map:\n");
+	BUG_ON(ARRAY_SIZE(dlm->node_map) & 3); /* better be mult of 4 :) */
+	for(i = 0; i < ARRAY_SIZE(dlm->node_map); i += 4)
+		dlmprintk("%0lx%0lx%0lx%0lx\n",
+			  dlm->node_map[i], dlm->node_map[i + 1],
+			  dlm->node_map[i + 2], dlm->node_map[i + 3]);
 
 #if 0
 	tmpret = net_register_handler("reco-request", 

Modified: trunk/cluster/dlmmod.h
===================================================================
--- trunk/cluster/dlmmod.h	2005-01-14 23:59:42 UTC (rev 1774)
+++ trunk/cluster/dlmmod.h	2005-01-15 00:51:41 UTC (rev 1775)
@@ -198,8 +198,8 @@
 	struct inode *group;
 	u32 key;
 	u16 group_index;
-	u32 node_map[8];
-	u32 recovery_map[8];
+	unsigned long node_map[BITS_TO_LONGS(NM_MAX_NODES)];
+	unsigned long recovery_map[BITS_TO_LONGS(NM_MAX_NODES)];
 	dlm_recovery_ctxt reco;
 };
 
@@ -289,10 +289,10 @@
 	wait_queue_head_t wq;
 	atomic_t woken;
 	atomic_t refcnt;
-	u32 maybe_map[8];
-	u32 vote_map[8];
-	u32 response_map[8];
-	u32 node_map[8];
+	unsigned long maybe_map[BITS_TO_LONGS(NM_MAX_NODES)];
+	unsigned long vote_map[BITS_TO_LONGS(NM_MAX_NODES)];
+	unsigned long response_map[BITS_TO_LONGS(NM_MAX_NODES)];
+	unsigned long node_map[BITS_TO_LONGS(NM_MAX_NODES)];
 	u16 master;
 	u8 error;
 	u8 type;    // BLOCK or MASTER