[Ocfs2-commits] mfasheh commits r1929 - trunk/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: smushran
Date: 2005-03-01 20:24:30 -0600 (Tue, 01 Mar 2005)
New Revision: 1929

Modified:
   trunk/fs/ocfs2/heartbeat.c
   trunk/fs/ocfs2/heartbeat.h
   trunk/fs/ocfs2/proc.c
   trunk/fs/ocfs2/vote.c
Log:
* teach the node_map stuff that osb->max_nodes is no longer also a
"max node #"

Signed-off-by: smushran



Modified: trunk/fs/ocfs2/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/heartbeat.c	2005-03-01 22:08:18 UTC (rev 1928)
+++ trunk/fs/ocfs2/heartbeat.c	2005-03-02 02:24:30 UTC (rev 1929)
@@ -62,25 +62,21 @@
 				int node_num,
 				void *data);
 
-static void __ocfs_node_map_dup(ocfs_super *osb,
-				ocfs_node_map *target,
-				ocfs_node_map *from);
 static inline void __ocfs_node_map_set_bit(ocfs_node_map *map,
 					   int bit);
 static inline void __ocfs_node_map_clear_bit(ocfs_node_map *map,
 					     int bit);
 static inline int __ocfs_node_map_is_empty(ocfs_node_map *map);
-static void __ocfs_node_map_dup(ocfs_super *osb,
-				ocfs_node_map *target,
+static void __ocfs_node_map_dup(ocfs_node_map *target,
 				ocfs_node_map *from);
 static void __ocfs_node_map_set(ocfs_node_map *target, ocfs_node_map *from);
 
 void ocfs2_init_node_maps(ocfs_super *osb)
 {
 	spin_lock_init(&osb->node_map_lock);
-	ocfs_node_map_init(osb, &osb->mounted_map);
-	ocfs_node_map_init(osb, &osb->recovery_map);
-	ocfs_node_map_init(osb, &osb->umount_map);
+	ocfs_node_map_init(&osb->mounted_map);
+	ocfs_node_map_init(&osb->recovery_map);
+	ocfs_node_map_init(&osb->umount_map);
 }
 
 static void ocfs2_hb_node_down_cb(struct inode *group,
@@ -163,10 +159,9 @@
 
 /* special case -1 for now
  * TODO: should *really* make sure the calling func never passes -1!!  */
-void ocfs_node_map_init(ocfs_super *osb,
-			ocfs_node_map *map)
+void ocfs_node_map_init(ocfs_node_map *map)
 {
-	map->num_nodes = osb->max_nodes;
+	map->num_nodes = OCFS_NODE_MAP_MAX_NODES;
 	memset(map->map, 0, BITS_TO_LONGS(OCFS_NODE_MAP_MAX_NODES) * 
 	       sizeof(unsigned long));
 }
@@ -242,12 +237,11 @@
 	return ret;
 }
 
-static void __ocfs_node_map_dup(ocfs_super *osb,
-				ocfs_node_map *target,
+static void __ocfs_node_map_dup(ocfs_node_map *target,
 				ocfs_node_map *from)
 {
 	OCFS_ASSERT(from->num_nodes > 0);
-	ocfs_node_map_init(osb, target);
+	ocfs_node_map_init(target);
 	__ocfs_node_map_set(target, from);
 }
 
@@ -260,7 +254,7 @@
 	int ret;
 
 	spin_lock(&osb->node_map_lock);
-	__ocfs_node_map_dup(osb, &temp, target);
+	__ocfs_node_map_dup(&temp, target);
 	__ocfs_node_map_clear_bit(&temp, bit);
 	ret = __ocfs_node_map_is_empty(&temp);
 	spin_unlock(&osb->node_map_lock);

Modified: trunk/fs/ocfs2/heartbeat.h
===================================================================
--- trunk/fs/ocfs2/heartbeat.h	2005-03-01 22:08:18 UTC (rev 1928)
+++ trunk/fs/ocfs2/heartbeat.h	2005-03-02 02:24:30 UTC (rev 1929)
@@ -33,7 +33,7 @@
 
 /* node map functions - used to keep track of mounted and in-recovery
  * nodes. */
-void ocfs_node_map_init(ocfs_super *osb, ocfs_node_map *map);
+void ocfs_node_map_init(ocfs_node_map *map);
 int ocfs_node_map_is_empty(ocfs_super *osb,
 			   ocfs_node_map *map);
 void ocfs_node_map_set_bit(ocfs_super *osb,

Modified: trunk/fs/ocfs2/proc.c
===================================================================
--- trunk/fs/ocfs2/proc.c	2005-03-01 22:08:18 UTC (rev 1928)
+++ trunk/fs/ocfs2/proc.c	2005-03-02 02:24:30 UTC (rev 1929)
@@ -432,7 +432,7 @@
 	osb = data;
 
 	if (osb) {
-		for (i = 0; i < osb->max_nodes; i++) {
+		for (i = 0; i < OCFS_NODE_MAP_MAX_NODES; i++) {
 			mount = ocfs_node_map_test_bit(osb, &osb->mounted_map, i) ? 'M' : ' ';
 			len += sprintf(page + len, "%2d %c\n", i, mount);
 		}

Modified: trunk/fs/ocfs2/vote.c
===================================================================
--- trunk/fs/ocfs2/vote.c	2005-03-01 22:08:18 UTC (rev 1928)
+++ trunk/fs/ocfs2/vote.c	2005-03-02 02:24:30 UTC (rev 1929)
@@ -415,8 +415,7 @@
 	return status;
 }
 
-static ocfs2_net_wait_ctxt *ocfs2_new_net_wait_ctxt(ocfs_super *osb,
-						    unsigned int response_id)
+static ocfs2_net_wait_ctxt *ocfs2_new_net_wait_ctxt(unsigned int response_id)
 {
 	ocfs2_net_wait_ctxt *w;
 
@@ -429,7 +428,7 @@
 
 	INIT_LIST_HEAD(&w->n_list);
 	init_waitqueue_head(&w->n_event);
-	ocfs_node_map_init(osb, &w->n_node_map);
+	ocfs_node_map_init(&w->n_node_map);
 	w->n_response_id = response_id;
 bail:
 	return w;
@@ -509,7 +508,7 @@
 
 	LOG_ENTRY();
 
-	w = ocfs2_new_net_wait_ctxt(osb, response_id);
+	w = ocfs2_new_net_wait_ctxt(response_id);
 	if (!w) {
 		status = -ENOMEM;
 		LOG_ERROR_STATUS(status);