[Ocfs2-tools-commits] mfasheh commits r977 - in trunk: libo2cb libo2cb/include libocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-06-24 13:32:03 -0500 (Fri, 24 Jun 2005)
New Revision: 977

Modified:
   trunk/libo2cb/include/o2cb.h
   trunk/libo2cb/include/ocfs2_heartbeat.h
   trunk/libo2cb/include/ocfs2_nodemanager.h
   trunk/libo2cb/o2cb_abi.c
   trunk/libocfs2/heartbeat.c
Log:
* update tools to handle the latest ocfs2

Signed-off-by: manish



Modified: trunk/libo2cb/include/o2cb.h
===================================================================
--- trunk/libo2cb/include/o2cb.h	2005-06-24 05:51:09 UTC (rev 976)
+++ trunk/libo2cb/include/o2cb.h	2005-06-24 18:32:03 UTC (rev 977)
@@ -74,8 +74,6 @@
 	int		r_block_bytes;
 	uint64_t	r_start_block;
 	uint64_t	r_blocks;
-	unsigned int	r_timeout_ms;
-	unsigned int	r_node_down_misses;
 };
 
 /* Expected use case for the region descriptor is to allocate it on

Modified: trunk/libo2cb/include/ocfs2_heartbeat.h
===================================================================
--- trunk/libo2cb/include/ocfs2_heartbeat.h	2005-06-24 05:51:09 UTC (rev 976)
+++ trunk/libo2cb/include/ocfs2_heartbeat.h	2005-06-24 18:32:03 UTC (rev 977)
@@ -33,7 +33,4 @@
 	__u32 hb_cksum;
 };
 
-#define O2HB_DEFAULT_TIMEOUT_MS		2000
-#define O2HB_DEFAULT_NODE_DOWN_MISSES	10
-
 #endif /* _OCFS2_HEARTBEAT_H */

Modified: trunk/libo2cb/include/ocfs2_nodemanager.h
===================================================================
--- trunk/libo2cb/include/ocfs2_nodemanager.h	2005-06-24 05:51:09 UTC (rev 976)
+++ trunk/libo2cb/include/ocfs2_nodemanager.h	2005-06-24 18:32:03 UTC (rev 977)
@@ -28,7 +28,7 @@
 #ifndef _OCFS2_NODEMANAGER_H
 #define _OCFS2_NODEMANAGER_H
 
-#define O2NM_API_VERSION	3
+#define O2NM_API_VERSION	4
 
 #define O2NM_MAX_NODES		255
 #define O2NM_INVALID_NODE_NUM	255

Modified: trunk/libo2cb/o2cb_abi.c
===================================================================
--- trunk/libo2cb/o2cb_abi.c	2005-06-24 05:51:09 UTC (rev 976)
+++ trunk/libo2cb/o2cb_abi.c	2005-06-24 18:32:03 UTC (rev 977)
@@ -517,9 +517,7 @@
 					      const char *device_name,
 					      int block_bytes,
 					      uint64_t start_block,
-					      uint64_t blocks,
-					      unsigned int timeout_ms,
-					      unsigned int dead_iter)
+					      uint64_t blocks)
 {
 	char _fake_cluster_name[NAME_MAX];
 	char region_path[PATH_MAX];
@@ -618,28 +616,6 @@
 	if (err)
 		goto out_rmdir;
 
-	ret = snprintf(num_buf, NAME_MAX - 1, "%u", timeout_ms);
-	if (ret <= 0 || ret == PATH_MAX - 1) {
-		err = O2CB_ET_INTERNAL_FAILURE;
-		goto out_rmdir;
-	}
-
-	err = o2cb_set_region_attribute(cluster_name, region_name,
-					"timeout_ms", num_buf);
-	if (err)
-		goto out_rmdir;
-
-	ret = snprintf(num_buf, NAME_MAX - 1, "%u", dead_iter);
-	if (ret <= 0 || ret == PATH_MAX - 1) {
-		err = O2CB_ET_INTERNAL_FAILURE;
-		goto out_rmdir;
-	}
-
-	err = o2cb_set_region_attribute(cluster_name, region_name,
-					"dead_iter", num_buf);
-	if (err)
-		goto out_rmdir;
-
 	fd = open64(device_name, O_RDWR);
 	if (fd < 0) {
 		switch (errno) {
@@ -1043,9 +1019,7 @@
 					   desc->r_device_name,
 					   desc->r_block_bytes,
 					   desc->r_start_block,
-					   desc->r_blocks,
-					   desc->r_timeout_ms,
-					   desc->r_node_down_misses);
+					   desc->r_blocks);
 	if (ret && ret != O2CB_ET_REGION_EXISTS)
 		goto up;
 

Modified: trunk/libocfs2/heartbeat.c
===================================================================
--- trunk/libocfs2/heartbeat.c	2005-06-24 05:51:09 UTC (rev 976)
+++ trunk/libocfs2/heartbeat.c	2005-06-24 18:32:03 UTC (rev 977)
@@ -93,8 +93,6 @@
 	desc->r_block_bytes		= sectsize;
 	desc->r_start_block		= start_block;
 	desc->r_blocks			= blocks;
-	desc->r_timeout_ms		= O2HB_DEFAULT_TIMEOUT_MS;
-	desc->r_node_down_misses	= O2HB_DEFAULT_NODE_DOWN_MISSES;
 
 leave:
 	if (buf)