[Ocfs2-commits] jlbec commits r1175 - trunk/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-21 19:23:12 -0500 (Mon, 21 Jun 2004)
New Revision: 1175

Modified:
   trunk/src/ocfs2_fs.h
   trunk/src/super.c
Log:

o Add the BAD_BLOCKS system inode.
o Reorder the system inode enum so that the inodes unused from a
  running kernel (GLOBAL_INODE_ALLOC, GLOBAL_INODE_BITMAP, and
  BAD_BLOCKS) are not loaded.

This changes nothing on disk.



Modified: trunk/src/ocfs2_fs.h
===================================================================
--- trunk/src/ocfs2_fs.h	2004-06-21 23:55:35 UTC (rev 1174)
+++ trunk/src/ocfs2_fs.h	2004-06-22 00:23:12 UTC (rev 1175)
@@ -114,13 +114,12 @@
 
 /* System file index */
 enum {
-	GLOBAL_BITMAP_SYSTEM_INODE = 0,
+	BAD_BLOCK_SYSTEM_INODE = 0,
 	GLOBAL_INODE_ALLOC_SYSTEM_INODE,
 	GLOBAL_INODE_ALLOC_BITMAP_SYSTEM_INODE,
-	//AUTOCONFIG_SYSTEM_INODE,
-	//PUBLISH_SYSTEM_INODE,
-	//VOTE_SYSTEM_INODE,
 	DLM_SYSTEM_INODE,
+#define OCFS2_FIRST_ONLINE_SYSTEM_INODE DLM_SYSTEM_INODE
+	GLOBAL_BITMAP_SYSTEM_INODE,
 	ORPHAN_DIR_SYSTEM_INODE,
 #define OCFS2_LAST_GLOBAL_SYSTEM_INODE ORPHAN_DIR_SYSTEM_INODE
 	EXTENT_ALLOC_SYSTEM_INODE,
@@ -134,13 +133,14 @@
 
 static char *ocfs2_system_inode_names[NUM_SYSTEM_INODES] = {
 	/* Global system inodes (single copy) */
-	[GLOBAL_BITMAP_SYSTEM_INODE]		"global_bitmap",
+	/* The first three are only used from userspace mfks/tunefs */
+	[BAD_BLOCK_SYSTEM_INODE]		"bad_blocks",
 	[GLOBAL_INODE_ALLOC_SYSTEM_INODE] 	"global_inode_alloc",
 	[GLOBAL_INODE_ALLOC_BITMAP_SYSTEM_INODE]	"global_inode_alloc_bitmap",
-	//[AUTOCONFIG_SYSTEM_INODE]		"autoconfig",
-	//[PUBLISH_SYSTEM_INODE]			"publish",
-	//[VOTE_SYSTEM_INODE]			"vote",
+
+	/* These are used by the running filesystem */
 	[DLM_SYSTEM_INODE]			"dlm",
+	[GLOBAL_BITMAP_SYSTEM_INODE]		"global_bitmap",
 	[ORPHAN_DIR_SYSTEM_INODE]		"orphan_dir",
 
 	/* Node-specific system inodes (one copy per node) */

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-06-21 23:55:35 UTC (rev 1174)
+++ trunk/src/super.c	2004-06-22 00:23:12 UTC (rev 1175)
@@ -233,7 +233,8 @@
 	}
 	osb->sys_root_inode = new;
 
-	for (i = 0; i <= OCFS2_LAST_GLOBAL_SYSTEM_INODE; i++) {
+	for (i = OCFS2_FIRST_ONLINE_SYSTEM_INODE;
+	     i <= OCFS2_LAST_GLOBAL_SYSTEM_INODE; i++) {
 		new = ocfs_get_system_file_inode(osb, i, osb->node_num);
 		if (!new) {
 			ocfs_release_system_inodes(osb);