[Ocfs2-tools-commits] manish commits r921 - in trunk: libo2cb libo2cb/include libocfs2 mkfs.ocfs2 mounted.ocfs2 ocfs2console/ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-06-01 20:11:23 -0500 (Wed, 01 Jun 2005)
New Revision: 921

Modified:
   trunk/libo2cb/include/ocfs2_nodemanager.h
   trunk/libo2cb/o2cb_abi.c
   trunk/libocfs2/heartbeat.c
   trunk/mkfs.ocfs2/mkfs.c
   trunk/mounted.ocfs2/mounted.c
   trunk/ocfs2console/ocfs2interface/nodeconfig.py
   trunk/ocfs2console/ocfs2interface/o2cbmodule.c
Log:
Resync with the kernel, and propagate namespace changes


Modified: trunk/libo2cb/include/ocfs2_nodemanager.h
===================================================================
--- trunk/libo2cb/include/ocfs2_nodemanager.h	2005-06-02 01:05:13 UTC (rev 920)
+++ trunk/libo2cb/include/ocfs2_nodemanager.h	2005-06-02 01:11:23 UTC (rev 921)
@@ -28,12 +28,12 @@
 #ifndef _OCFS2_NODEMANAGER_H
 #define _OCFS2_NODEMANAGER_H
 
-#define NM_API_VERSION		3
+#define O2NM_API_VERSION	3
 
-#define NM_MAX_NODES		255
-#define NM_INVALID_NODE_NUM	255
+#define O2NM_MAX_NODES		255
+#define O2NM_INVALID_NODE_NUM	255
 
 /* host name, group name, cluster name all 64 bytes */
-#define NM_MAX_NAME_LEN          64    // __NEW_UTS_LEN
+#define O2NM_MAX_NAME_LEN        64    // __NEW_UTS_LEN
 
 #endif /* _OCFS2_NODEMANAGER_H */

Modified: trunk/libo2cb/o2cb_abi.c
===================================================================
--- trunk/libo2cb/o2cb_abi.c	2005-06-02 01:05:13 UTC (rev 920)
+++ trunk/libo2cb/o2cb_abi.c	2005-06-02 01:11:23 UTC (rev 921)
@@ -455,7 +455,7 @@
 	if (ret < 0)
 		return O2CB_ET_INTERNAL_FAILURE;
 
-	if (NM_API_VERSION < module_version)
+	if (O2NM_API_VERSION < module_version)
 		return O2CB_ET_BAD_VERSION;
 
 	return 0;

Modified: trunk/libocfs2/heartbeat.c
===================================================================
--- trunk/libocfs2/heartbeat.c	2005-06-02 01:05:13 UTC (rev 920)
+++ trunk/libocfs2/heartbeat.c	2005-06-02 01:11:23 UTC (rev 921)
@@ -82,8 +82,8 @@
 	blocks = rec->e_clusters << cluster_bits;
 	blocks >>= block_bits;
 
-	if (blocks > NM_MAX_NODES)
-		blocks = NM_MAX_NODES;
+	if (blocks > O2NM_MAX_NODES)
+		blocks = O2NM_MAX_NODES;
 
 	start_block = rec->e_blkno << block_bits;
 	start_block >>= sectsize_bits;

Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c	2005-06-02 01:05:13 UTC (rev 920)
+++ trunk/mkfs.ocfs2/mkfs.c	2005-06-02 01:11:23 UTC (rev 921)
@@ -305,7 +305,7 @@
 		tmprec->fe_off >> s->blocksize_bits;
 
 	tmprec = &(record[HEARTBEAT_SYSTEM_INODE][0]);
-	need = (NM_MAX_NODES + 1) << s->blocksize_bits;
+	need = (O2NM_MAX_NODES + 1) << s->blocksize_bits;
 
 	alloc_bytes_from_bitmap(s, need, s->global_bm, &tmprec->extent_off, &tmprec->extent_len);
 	tmprec->file_size = need;

Modified: trunk/mounted.ocfs2/mounted.c
===================================================================
--- trunk/mounted.ocfs2/mounted.c	2005-06-02 01:05:13 UTC (rev 920)
+++ trunk/mounted.ocfs2/mounted.c	2005-06-02 01:11:23 UTC (rev 921)
@@ -56,7 +56,7 @@
 	uint8_t n;
 	uint8_t *nums = dev->node_nums;
 
-	for (i = 0; i < dev->max_slots && nums[i] != NM_MAX_NODES; ++i) {
+	for (i = 0; i < dev->max_slots && nums[i] != O2NM_MAX_NODES; ++i) {
 		if (i)
 			printf(", ");
 		n = nums[i];
@@ -74,7 +74,7 @@
 	struct list_head *pos;
 	char **node_names = NULL;
 	char **cluster_names = NULL;
-	char *nodes[NM_MAX_NODES];
+	char *nodes[O2NM_MAX_NODES];
 	int i = 0;
 	uint16_t num;
 
@@ -90,7 +90,7 @@
 			if (o2cb_get_node_num(*cluster_names, node_names[i],
 					      &num))
 				break;
-			if (num >= NM_MAX_NODES)
+			if (num >= O2NM_MAX_NODES)
 				break;
 			nodes[num] = node_names[i];
 			++i;
@@ -109,7 +109,7 @@
 			fflush(stdout);
 			com_err("Unknown", dev->errcode, " ");
 		} else {
-			if (dev->node_nums[0] == NM_MAX_NODES) {
+			if (dev->node_nums[0] == O2NM_MAX_NODES) {
 				printf("Not mounted\n");
 				continue;
 			}

Modified: trunk/ocfs2console/ocfs2interface/nodeconfig.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/nodeconfig.py	2005-06-02 01:05:13 UTC (rev 920)
+++ trunk/ocfs2console/ocfs2interface/nodeconfig.py	2005-06-02 01:11:23 UTC (rev 921)
@@ -223,9 +223,9 @@
         self.set_response_sensitive(gtk.RESPONSE_APPLY, state)
             
     def add_node(self, b):
-        if len(self.store) == o2cb.NM_MAX_NODES:
+        if len(self.store) == o2cb.O2NM_MAX_NODES:
             error_box(self, 'Cannot have more than %d nodes in a cluster' %
-                            o2cb.NM_MAX_NODES)
+                            o2cb.O2NM_MAX_NODES)
             return
 
         node_attrs = self.node_query(title='Add Node')
@@ -345,7 +345,7 @@
             table.attach(widget, 1, 2, row, row + 1)
 
             if field.column == COLUMN_NAME:
-                widget.set_max_length(o2cb.NM_MAX_NAME_LEN)
+                widget.set_max_length(o2cb.O2NM_MAX_NAME_LEN)
             elif field.column == COLUMN_IP_PORT:
                 widget.set_numeric(True)
 

Modified: trunk/ocfs2console/ocfs2interface/o2cbmodule.c
===================================================================
--- trunk/ocfs2console/ocfs2interface/o2cbmodule.c	2005-06-02 01:05:13 UTC (rev 920)
+++ trunk/ocfs2console/ocfs2interface/o2cbmodule.c	2005-06-02 01:11:23 UTC (rev 921)
@@ -535,7 +535,7 @@
 #undef ADD_STR_CONSTANT
 
 #define ADD_INT_CONSTANT(name) \
-    PyModule_AddIntConstant (m, "NM_" #name, NM_ ## name)
+    PyModule_AddIntConstant (m, "O2NM_" #name, O2NM_ ## name)
 
   ADD_INT_CONSTANT (API_VERSION);