[Ocfs2-commits] jlbec commits r1526 - branches/dlm-changes/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-09-30 14:41:54 -0500 (Thu, 30 Sep 2004)
New Revision: 1526

Modified:
   branches/dlm-changes/src/alloc.c
   branches/dlm-changes/src/inode.c
   branches/dlm-changes/src/ocfs2_fs.h
   branches/dlm-changes/src/suballoc.c
Log:

o Change the usage of BITMAP_ALLOC_SYSTEM_FILE to ALLOC_SYSTEM_FILE,
  because I like the name better.  This is part of _removing_ the extra
  files from ocfs2_fs.h.



Modified: branches/dlm-changes/src/alloc.c
===================================================================
--- branches/dlm-changes/src/alloc.c	2004-09-30 01:09:37 UTC (rev 1525)
+++ branches/dlm-changes/src/alloc.c	2004-09-30 19:41:54 UTC (rev 1526)
@@ -367,7 +367,7 @@
 	for (i = 0; i < osb->max_nodes; i++) {
 		if (ext_alloc_free[i] != NULL) {
 			ext_alloc_inode[i] = 
-				ocfs_get_system_file_inode(osb, EXTENT_ALLOC_BITMAP_SYSTEM_INODE, i);
+				ocfs_get_system_file_inode(osb, EXTENT_ALLOC_SYSTEM_INODE, i);
 			if (!ext_alloc_inode[i]) {
 				status = -EINVAL;
 				LOG_ERROR_STATUS (status);
@@ -554,7 +554,7 @@
 			       i, FreeLog->update[i].length, FreeLog->update[i].file_off, 
 			       FreeLog->update[i].type, FreeLog->update[i].node_num);
 
-	file_type = EXTENT_ALLOC_BITMAP_SYSTEM_INODE;
+	file_type = EXTENT_ALLOC_SYSTEM_INODE;
 	blockSize = osb->sb->s_blocksize;
 	blockSizeBits = osb->sb->s_blocksize_bits;
 

Modified: branches/dlm-changes/src/inode.c
===================================================================
--- branches/dlm-changes/src/inode.c	2004-09-30 01:09:37 UTC (rev 1525)
+++ branches/dlm-changes/src/inode.c	2004-09-30 19:41:54 UTC (rev 1526)
@@ -642,7 +642,7 @@
 			     orphan_dir_inode);
 	ocfs_handle_add_inode(handle, orphan_dir_inode);
 
-	inode_alloc_inode = ocfs_get_system_file_inode(osb, INODE_ALLOC_BITMAP_SYSTEM_INODE, fe->i_suballoc_node);
+	inode_alloc_inode = ocfs_get_system_file_inode(osb, INODE_ALLOC_SYSTEM_INODE, fe->i_suballoc_node);
 	if (!inode_alloc_inode) {
 		status = -EEXIST;
 		LOG_ERROR_STATUS(status);

Modified: branches/dlm-changes/src/ocfs2_fs.h
===================================================================
--- branches/dlm-changes/src/ocfs2_fs.h	2004-09-30 01:09:37 UTC (rev 1525)
+++ branches/dlm-changes/src/ocfs2_fs.h	2004-09-30 19:41:54 UTC (rev 1526)
@@ -118,16 +118,13 @@
 enum {
 	BAD_BLOCK_SYSTEM_INODE = 0,
 	GLOBAL_INODE_ALLOC_SYSTEM_INODE,
-	GLOBAL_INODE_ALLOC_BITMAP_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,
-	EXTENT_ALLOC_BITMAP_SYSTEM_INODE,
 	INODE_ALLOC_SYSTEM_INODE,
-	INODE_ALLOC_BITMAP_SYSTEM_INODE,
 	JOURNAL_SYSTEM_INODE,
 	LOCAL_ALLOC_SYSTEM_INODE,
 	NUM_SYSTEM_INODES
@@ -138,7 +135,6 @@
 	/* 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",
 
 	/* These are used by the running filesystem */
 	[DLM_SYSTEM_INODE]			"dlm",
@@ -147,9 +143,7 @@
 
 	/* Node-specific system inodes (one copy per node) */
 	[EXTENT_ALLOC_SYSTEM_INODE]		"extent_alloc:%04d",
-	[EXTENT_ALLOC_BITMAP_SYSTEM_INODE]	"extent_alloc_bitmap:%04d",
 	[INODE_ALLOC_SYSTEM_INODE]		"inode_alloc:%04d",
-	[INODE_ALLOC_BITMAP_SYSTEM_INODE]	"inode_alloc_bitmap:%04d",
 	[JOURNAL_SYSTEM_INODE]			"journal:%04d",
 	[LOCAL_ALLOC_SYSTEM_INODE]		"local_alloc:%04d"
 };

Modified: branches/dlm-changes/src/suballoc.c
===================================================================
--- branches/dlm-changes/src/suballoc.c	2004-09-30 01:09:37 UTC (rev 1525)
+++ branches/dlm-changes/src/suballoc.c	2004-09-30 19:41:54 UTC (rev 1526)
@@ -432,9 +432,9 @@
 	(*ac)->ac_which = OCFS_AC_USE_META;
 
 #ifndef OCFS_USE_ALL_METADATA_SUBALLOCATORS
-	alloc_inode = ocfs_get_system_file_inode(osb, EXTENT_ALLOC_BITMAP_SYSTEM_INODE, 0);
+	alloc_inode = ocfs_get_system_file_inode(osb, EXTENT_ALLOC_SYSTEM_INODE, 0);
 #else
-	alloc_inode = ocfs_get_system_file_inode(osb, EXTENT_ALLOC_BITMAP_SYSTEM_INODE, osb->node_num);
+	alloc_inode = ocfs_get_system_file_inode(osb, EXTENT_ALLOC_SYSTEM_INODE, osb->node_num);
 #endif
 	if (!alloc_inode) {
 		status = -ENOMEM;
@@ -482,7 +482,7 @@
 	(*ac)->ac_handle = handle;
 	(*ac)->ac_which = OCFS_AC_USE_INODE;
 
-	alloc_inode = ocfs_get_system_file_inode(osb, INODE_ALLOC_BITMAP_SYSTEM_INODE, osb->node_num);
+	alloc_inode = ocfs_get_system_file_inode(osb, INODE_ALLOC_SYSTEM_INODE, osb->node_num);
 	if (!alloc_inode) {
 		status = -ENOMEM;
 		LOG_ERROR_STATUS(status);