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

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: manish
Date: 2005-05-30 12:59:27 -0500 (Mon, 30 May 2005)
New Revision: 2336

Modified:
   trunk/fs/ocfs2/heartbeat.c
Log:
* remove some dead code

Signed-off-by: manish



Modified: trunk/fs/ocfs2/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/heartbeat.c	2005-05-28 04:24:15 UTC (rev 2335)
+++ trunk/fs/ocfs2/heartbeat.c	2005-05-30 17:59:27 UTC (rev 2336)
@@ -4,7 +4,7 @@
  * heartbeat.c
  *
  * Register ourselves with the heartbaet service, keep our node maps
- * up to date, and fire off recover when needed.
+ * up to date, and fire off recovery when needed.
  *
  * Copyright (C) 2002, 2004 Oracle.  All rights reserved.
  *
@@ -328,114 +328,3 @@
 	spin_unlock(&osb->node_map_lock);
 	return idx;
 }
-
-#if 0
-/* unused (for now) node map functions. */
-
-/* uses the heartbeat api to test whether a given global node num is
- * heartbeating. Warning: this function can sleep in
- * hb_fill_node_map() */
-int ocfs2_is_node_alive(ocfs_super *osb,
-			unsigned int node_num)
-{
-	int ret;
-	ocfs_node_map tmpmap;
-
-	ocfs_node_map_init(osb, &tmpmap);
-
-	ret = hb_fill_node_map(osb->group_inode, &tmpmap, sizeof(tmpmap.map));
-	if (ret < 0) {
-		mlog_errno(ret);
-		goto bail;
-	}
-
-	ret = ocfs_node_map_test_bit(osb, &tmpmap, node_num);
-
-bail:
-	return ret;
-}
-
-static int ocfs_node_map_stringify(ocfs_node_map *map, char **str)
-{
-	int i, n;
-	char *s;
-
-	OCFS_ASSERT(map->num_nodes > 0);
-
-	*str = kmalloc( strlen("123 ") * map->num_nodes, GFP_KERNEL);
-	if (!(*str))
-		return -ENOMEM;
-
-	memset(*str, 0, strlen("123 ") * map->num_nodes);
-
-	s = *str;
-	for (i = 0; i < map->num_nodes; i++) {
-		if (ocfs_node_map_test_bit(map, i)) {
-			n = sprintf(s, "%3d ", i);
-			if (n != strlen("123 ")) {
-				kfree(*str);
-				return -ENOMEM;
-			}
-			s += n;
-		}
-	}
-	return 0;
-}
-
-void ocfs_node_map_and(ocfs_node_map *target, ocfs_node_map *mask)
-{
-	int num_longs, i; 
-
-	OCFS_ASSERT(target->num_nodes == mask->num_nodes);
-	OCFS_ASSERT(target->num_nodes > 0);
-	
-	num_longs = BITS_TO_LONGS(target->num_nodes);
-	for (i = 0; i < num_longs; i++)
-		target->map[i] &= mask->map[i];
-}
-
-int ocfs_node_map_is_equal(ocfs_node_map *map1, ocfs_node_map *map2)
-{
-	int num_longs, i; 
-
-	OCFS_ASSERT(map1->num_nodes == map2->num_nodes);
-	OCFS_ASSERT(map1->num_nodes > 0);
-	
-	num_longs = BITS_TO_LONGS(map1->num_nodes);
-	for (i = 0; i < num_longs; i++) {
-		if (map1->map[i] != map2->map[i])
-			return 0;
-	}
-	return 1;
-}
-
-
-// clear all the bits in "target" which are set in "mask"
-static void __ocfs_node_map_clear_bits(ocfs_node_map *target,
-				       ocfs_node_map *mask)
-{
-	int bit, prev=0;
-	while (1) {
-		bit = find_next_bit(mask->map, mask->num_nodes, prev);
-		if (bit >= mask->num_nodes)
-			break;
-		ocfs_node_map_clear_bit(target, bit);
-		prev = bit+1;
-	}
-}
-
-// set all the bits in "target" which are set in "mask"
-void __ocfs_node_map_set_bits(ocfs_node_map *target,
-			      ocfs_node_map *mask)
-{
-	int bit, prev=0;
-	while (1) {
-		bit = find_next_bit(mask->map, mask->num_nodes, prev);
-		if (bit >= mask->num_nodes)
-			break;
-		ocfs_node_map_set_bit(target, bit);
-		prev = bit+1;
-	}
-}
-#endif
-