[Ocfs2-commits] mfasheh commits r2427 - trunk/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-06-24 13:31:18 -0500 (Fri, 24 Jun 2005)
New Revision: 2427

Modified:
   trunk/fs/ocfs2/cluster/heartbeat.c
   trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h
   trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h
Log:
* remove some tunables that are no longer actually tunable.

Signed-off-by: manish



Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c	2005-06-24 06:32:59 UTC (rev 2426)
+++ trunk/fs/ocfs2/cluster/heartbeat.c	2005-06-24 18:31:18 UTC (rev 2427)
@@ -891,61 +891,6 @@
 	kfree(reg);
 }
 
-static ssize_t o2hb_region_dead_iter_read(struct o2hb_region *reg,
-					  char *page)
-{
-	return sprintf(page, "%u\n", reg->hr_dead_iter);
-}
-
-static ssize_t o2hb_region_dead_iter_write(struct o2hb_region *reg,
-					   const char *page,
-					   size_t count)
-{
-	unsigned long tmp;
-	char *p = (char *)page;
-
-	if (reg->hr_bdev)
-		return -EINVAL;
-
-	tmp = simple_strtoul(p, &p, 0);
-	if (!p || (*p && (*p != '\n')))
-		return -EINVAL;
-
-	if (!tmp)
-		return -ERANGE;
-
-	/* XXX */
-	reg->hr_dead_iter = O2HB_DEAD_THRESHOLD;
-
-	return count;
-}
-
-static ssize_t o2hb_region_timeout_ms_read(struct o2hb_region *reg,
-					   char *page)
-{
-	return sprintf(page, "%u\n", reg->hr_timeout_ms);
-}
-
-static ssize_t o2hb_region_timeout_ms_write(struct o2hb_region *reg,
-					    const char *page,
-					    size_t count)
-{
-	unsigned long tmp;
-	char *p = (char *)page;
-
-	if (reg->hr_bdev)
-		return -EINVAL;
-
-	tmp = simple_strtoul(p, &p, 0);
-	if (!p || (*p && (*p != '\n')))
-		return -EINVAL;
-
-	/* XXX */
-	reg->hr_timeout_ms = O2HB_REGION_TIMEOUT_MS;
-
-	return count;
-}
-
 static int o2hb_read_block_input(struct o2hb_region *reg,
 				 const char *page,
 				 size_t count,
@@ -1068,6 +1013,8 @@
 static void o2hb_init_region_params(struct o2hb_region *reg)
 {
 	reg->hr_slots_per_page = PAGE_CACHE_SIZE >> reg->hr_block_bits;
+	reg->hr_dead_iter = O2HB_DEAD_THRESHOLD;
+	reg->hr_timeout_ms = O2HB_REGION_TIMEOUT_MS;
 
 	mlog(ML_HEARTBEAT, "hr_start_block = %llu, hr_blocks = %u\n",
 	     reg->hr_start_block, reg->hr_blocks);
@@ -1207,8 +1154,7 @@
 		goto out;
 
 	if (reg->hr_blocks == 0 || reg->hr_start_block == 0 ||
-	    reg->hr_block_bytes == 0 || reg->hr_dead_iter == 0 ||
-	    reg->hr_timeout_ms == 0)
+	    reg->hr_block_bytes == 0)
 		goto out;
 
 	inode = igrab(filp->f_mapping->host);
@@ -1296,22 +1242,6 @@
 	ssize_t (*store)(struct o2hb_region *, const char *, size_t);
 };
 
-static struct o2hb_region_attribute o2hb_region_attr_dead_iter = {
-	.attr	= { .ca_owner = THIS_MODULE,
-		    .ca_name = "dead_iter",
-		    .ca_mode = S_IRUGO | S_IWUSR },
-	.show	= o2hb_region_dead_iter_read,
-	.store	= o2hb_region_dead_iter_write,
-};
-
-static struct o2hb_region_attribute o2hb_region_attr_timeout_ms = {
-	.attr	= { .ca_owner = THIS_MODULE,
-		    .ca_name = "timeout_ms",
-		    .ca_mode = S_IRUGO | S_IWUSR },
-	.show	= o2hb_region_timeout_ms_read,
-	.store	= o2hb_region_timeout_ms_write,
-};
-
 static struct o2hb_region_attribute o2hb_region_attr_block_bytes = {
 	.attr	= { .ca_owner = THIS_MODULE,
 		    .ca_name = "block_bytes",
@@ -1345,8 +1275,6 @@
 };
 
 static struct configfs_attribute *o2hb_region_attrs[] = {
-	&o2hb_region_attr_dead_iter.attr,
-	&o2hb_region_attr_timeout_ms.attr,
 	&o2hb_region_attr_block_bytes.attr,
 	&o2hb_region_attr_start_block.attr,
 	&o2hb_region_attr_blocks.attr,

Modified: trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h
===================================================================
--- trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h	2005-06-24 06:32:59 UTC (rev 2426)
+++ trunk/fs/ocfs2/cluster/ocfs2_heartbeat.h	2005-06-24 18:31:18 UTC (rev 2427)
@@ -34,7 +34,4 @@
 	__u64 hb_generation;
 };
 
-#define O2HB_DEFAULT_TIMEOUT_MS		2000
-#define O2HB_DEFAULT_NODE_DOWN_MISSES	10
-
 #endif /* _OCFS2_HEARTBEAT_H */

Modified: trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h
===================================================================
--- trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h	2005-06-24 06:32:59 UTC (rev 2426)
+++ trunk/fs/ocfs2/cluster/ocfs2_nodemanager.h	2005-06-24 18:31:18 UTC (rev 2427)
@@ -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