[Ocfs2-commits] mfasheh commits r2585 - branches/readonly-operation/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2005-09-16 17:57:03 -0500 (Fri, 16 Sep 2005)
New Revision: 2585

Modified:
   branches/readonly-operation/fs/ocfs2/cluster/heartbeat.c
Log:
* merge trunk revision 2581 into readonly-operation branch



Modified: branches/readonly-operation/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- branches/readonly-operation/fs/ocfs2/cluster/heartbeat.c	2005-09-16 22:54:46 UTC (rev 2584)
+++ branches/readonly-operation/fs/ocfs2/cluster/heartbeat.c	2005-09-16 22:57:03 UTC (rev 2585)
@@ -97,7 +97,7 @@
 struct o2hb_disk_slot {
 	struct o2hb_disk_heartbeat_block *ds_raw_block;
 	u8			ds_node_num;
-	unsigned long		ds_last_time;
+	u64			ds_last_time;
 	u64			ds_last_generation;
 	u16			ds_equal_samples;
 	u16			ds_changed_samples;
@@ -696,10 +696,11 @@
 
 	slot->ds_last_generation = le64_to_cpu(hb_block->hb_generation);
 
-	mlog(ML_HEARTBEAT, "Slot %d has generation 0x%"MLFx64", cksum 0x%x "
-	     "changed samples %u, equal samples %u\n",
+	mlog(ML_HEARTBEAT, "Slot %d gen 0x%"MLFx64" cksum 0x%x "
+	     "seq %"MLFu64" last %"MLFu64" changed %u equal %u\n",
 	     slot->ds_node_num, slot->ds_last_generation,
-	     le32_to_cpu(hb_block->hb_cksum), slot->ds_changed_samples,
+	     le32_to_cpu(hb_block->hb_cksum), le64_to_cpu(hb_block->hb_seq), 
+	     slot->ds_last_time, slot->ds_changed_samples,
 	     slot->ds_equal_samples);
 
 	spin_lock(&o2hb_live_lock);