[Ocfs2-commits] smushran commits r2988 - branches/ocfs2-1.2/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2007-03-13 10:12:23 -0700 (Tue, 13 Mar 2007)
New Revision: 2988

Modified:
   branches/ocfs2-1.2/fs/ocfs2/cluster/nodemanager.c
   branches/ocfs2-1.2/fs/ocfs2/cluster/nodemanager.h
Log:
ocfs2: [patch 1/3] OCFS2 Configurable timeouts - Expose o2nm_cluster

Moves struct o2nm_cluster from nodemanager.c to nodemanager.h

Authored by: Andrew Beekhof <abeekhof at suse.de>
Ported to 1.2 by: Jeff Mahoney <jmahoney at suse.de>
Signed-off-by: mfasheh

Modified: branches/ocfs2-1.2/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/cluster/nodemanager.c	2007-03-12 22:27:08 UTC (rev 2987)
+++ branches/ocfs2-1.2/fs/ocfs2/cluster/nodemanager.c	2007-03-13 17:12:23 UTC (rev 2988)
@@ -35,7 +35,7 @@
 /* for now we operate under the assertion that there can be only one
  * cluster active at a time.  Changing this will require trickling
  * cluster references throughout where nodes are looked up */
-static struct o2nm_cluster *o2nm_single_cluster = NULL;
+struct o2nm_cluster *o2nm_single_cluster = NULL;
 
 #define OCFS2_MAX_HB_CTL_PATH 256
 static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl";
@@ -97,17 +97,6 @@
 }
 EXPORT_SYMBOL_GPL(o2nm_get_hb_ctl_path);
 
-struct o2nm_cluster {
-	struct config_group	cl_group;
-	unsigned		cl_has_local:1;
-	u8			cl_local_node;
-	rwlock_t		cl_nodes_lock;
-	struct o2nm_node  	*cl_nodes[O2NM_MAX_NODES];
-	struct rb_root		cl_node_ip_tree;
-	/* this bitmap is part of a hack for disk bitmap.. will go eventually. - zab */
-	unsigned long	cl_nodes_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];
-};
-
 struct o2nm_node *o2nm_get_node_by_num(u8 node_num)
 {
 	struct o2nm_node *node = NULL;

Modified: branches/ocfs2-1.2/fs/ocfs2/cluster/nodemanager.h
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/cluster/nodemanager.h	2007-03-12 22:27:08 UTC (rev 2987)
+++ branches/ocfs2-1.2/fs/ocfs2/cluster/nodemanager.h	2007-03-13 17:12:23 UTC (rev 2988)
@@ -53,6 +53,18 @@
 	unsigned long		nd_set_attributes;
 };
 
+struct o2nm_cluster {
+	struct config_group	cl_group;
+	unsigned		cl_has_local:1;
+	u8			cl_local_node;
+	rwlock_t		cl_nodes_lock;
+	struct o2nm_node  	*cl_nodes[O2NM_MAX_NODES];
+	struct rb_root		cl_node_ip_tree;
+	/* this bitmap is part of a hack for disk bitmap.. will go eventually. - zab */
+	unsigned long	cl_nodes_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];
+};
+extern struct o2nm_cluster *o2nm_single_cluster;
+
 u8 o2nm_this_node(void);
 
 int o2nm_configured_node_map(unsigned long *map, unsigned bytes);