[Ocfs2-commits] mfasheh commits r1694 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-12-06 17:10:07 -0600 (Mon, 06 Dec 2004)
New Revision: 1694

Modified:
   trunk/src/ocfs2_fs.h
   trunk/src/super.c
Log:
* use "heartbeat" system file instead of "dlm"



Modified: trunk/src/ocfs2_fs.h
===================================================================
--- trunk/src/ocfs2_fs.h	2004-12-06 21:45:32 UTC (rev 1693)
+++ trunk/src/ocfs2_fs.h	2004-12-06 23:10:07 UTC (rev 1694)
@@ -93,7 +93,7 @@
 #define OCFS2_LOCAL_ALLOC_FL	(0x00000040)	/* Node local alloc bitmap */
 #define OCFS2_BITMAP_FL		(0x00000080)	/* Allocation bitmap */
 #define OCFS2_JOURNAL_FL	(0x00000100)	/* Node journal */
-#define OCFS2_DLM_FL		(0x00000200)	/* DLM area */
+#define OCFS2_HEARTBEAT_FL	(0x00000200)	/* Heartbeat area */
 #define OCFS2_CHAIN_FL		(0x00000400)	/* Chain allocator */
 
 /*
@@ -122,7 +122,7 @@
 	GLOBAL_INODE_ALLOC_SYSTEM_INODE,
 	SLOT_MAP_SYSTEM_INODE,
 #define OCFS2_FIRST_ONLINE_SYSTEM_INODE SLOT_MAP_SYSTEM_INODE
-	DLM_SYSTEM_INODE,
+	HEARTBEAT_SYSTEM_INODE,
 	GLOBAL_BITMAP_SYSTEM_INODE,
 	ORPHAN_DIR_SYSTEM_INODE,
 #define OCFS2_LAST_GLOBAL_SYSTEM_INODE ORPHAN_DIR_SYSTEM_INODE
@@ -141,7 +141,7 @@
 
 	/* These are used by the running filesystem */
 	[SLOT_MAP_SYSTEM_INODE]			"slot_map",
-	[DLM_SYSTEM_INODE]			"dlm",
+	[HEARTBEAT_SYSTEM_INODE]		"heartbeat",
 	[GLOBAL_BITMAP_SYSTEM_INODE]		"global_bitmap",
 	[ORPHAN_DIR_SYSTEM_INODE]		"orphan_dir",
 

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-12-06 21:45:32 UTC (rev 1693)
+++ trunk/src/super.c	2004-12-06 23:10:07 UTC (rev 1694)
@@ -1255,17 +1255,16 @@
 	}
 
 	/*
-	 * an inode for the whole DLM area
-	 * autoconfig, new autoconfig, publish, vote
+	 * an inode for the heartbeat area
 	 */	
-	inode = ocfs_get_system_file_inode(osb, DLM_SYSTEM_INODE, -1);
+	inode = ocfs_get_system_file_inode(osb, HEARTBEAT_SYSTEM_INODE, -1);
 	if (!inode) {
 		LOG_ERROR_STATUS(status = -EINVAL);
 		goto bail;
 	}
 
 	if (inode->i_size >> osb->sb->s_blocksize_bits < OCFS2_MAX_NODES) {
-		LOG_ERROR_ARGS("dlm area size incorrect: "
+		LOG_ERROR_ARGS("heartbeat area size incorrect: "
 			       "found=%llu, need=%u\n", 
 			       inode->i_size,
 			       OCFS2_MAX_NODES << osb->sb->s_blocksize_bits);