[Ocfs2-commits] zab commits r2000 - branches/usysfsify/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: zab
Date: 2005-03-17 19:05:40 -0600 (Thu, 17 Mar 2005)
New Revision: 2000

Modified:
   branches/usysfsify/fs/ocfs2/cluster/heartbeat.c
Log:
o be more careful not to generate hb events for our node
  and make sure its in the node map


Modified: branches/usysfsify/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- branches/usysfsify/fs/ocfs2/cluster/heartbeat.c	2005-03-18 00:47:27 UTC (rev 1999)
+++ branches/usysfsify/fs/ocfs2/cluster/heartbeat.c	2005-03-18 01:05:40 UTC (rev 2000)
@@ -283,6 +283,9 @@
 
 	/* now we read again and see what other nodes have done */
 	for(i = 0; i < reg->hr_blocks; i++) {
+		/* never, ever, generate events for our node */
+		if (i == nm_this_node())
+			continue;
 		slot = &reg->hr_slots[i];
 
 		bh = slot->ds_bh;
@@ -411,6 +414,9 @@
 	}
 
 	up_read(&hb_callback_sem);
+
+	/* our node is Always Up */
+	set_bit(nm_this_node(), map);
 }
 EXPORT_SYMBOL(hb_fill_node_map);