[Ocfs2-tools-commits] jlbec commits r303 - in branches/dlm-changes: libocfs2/include mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-09-30 18:14:07 -0500 (Thu, 30 Sep 2004)
New Revision: 303

Modified:
   branches/dlm-changes/libocfs2/include/ocfs2_fs.h
   branches/dlm-changes/mkfs.ocfs2/mkfs.c
Log:

o Tweak mkfs to support the removal of BITMAP_ALLOC files.  Just
  a hack for now.



Modified: branches/dlm-changes/libocfs2/include/ocfs2_fs.h
===================================================================
--- branches/dlm-changes/libocfs2/include/ocfs2_fs.h	2004-09-30 22:00:51 UTC (rev 302)
+++ branches/dlm-changes/libocfs2/include/ocfs2_fs.h	2004-09-30 23:14:07 UTC (rev 303)
@@ -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/mkfs.ocfs2/mkfs.c
===================================================================
--- branches/dlm-changes/mkfs.ocfs2/mkfs.c	2004-09-30 22:00:51 UTC (rev 302)
+++ branches/dlm-changes/mkfs.ocfs2/mkfs.c	2004-09-30 23:14:07 UTC (rev 303)
@@ -79,8 +79,6 @@
 #define AUTOCONF_BLOCKS(i,min)  ((2+4) + (i<min ? min : i))
 #define NUM_LOCAL_SYSTEM_FILES  6
 
-#define MAGIC_SUPERBLOCK_BLOCK_NUMBER  2
-
 #define OCFS2_OS_LINUX           0
 #define OCFS2_OS_HURD            1
 #define OCFS2_OS_MASIX           2
@@ -263,14 +261,11 @@
 SystemFileInfo system_files[] = {
 	{ "bad_blocks", SFI_OTHER, 1, 0 },
 	{ "global_inode_alloc", SFI_OTHER, 1, 0 },
-	{ "global_inode_alloc_bitmap", SFI_BITMAP, 1, 0 },
 	{ "dlm", SFI_DLM, 1, 0 },
 	{ "global_bitmap", SFI_BITMAP, 1, 0 },
 	{ "orphan_dir", SFI_OTHER, 1, 1 },
-	{ "extent_alloc:%04d", SFI_OTHER, 0, 0 },
-	{ "extent_alloc_bitmap:%04d", SFI_CHAIN, 0, 0 },
-	{ "inode_alloc:%04d", SFI_OTHER, 0, 0 },
-	{ "inode_alloc_bitmap:%04d", SFI_CHAIN, 0, 0 },
+	{ "extent_alloc:%04d", SFI_CHAIN, 0, 0 },
+	{ "inode_alloc:%04d", SFI_CHAIN, 0, 0 },
 	{ "journal:%04d", SFI_JOURNAL, 0, 0 },
 	{ "local_alloc:%04d", SFI_LOCAL_ALLOC, 0, 0 }
 };
@@ -281,6 +276,7 @@
 	State *s;
 	SystemFileDiskRecord *record[NUM_SYSTEM_INODES];
 	SystemFileDiskRecord global_alloc_rec;
+	SystemFileDiskRecord crap_rec;
 	SystemFileDiskRecord superblock_rec;
 	SystemFileDiskRecord root_dir_rec;
 	SystemFileDiskRecord system_dir_rec;
@@ -291,7 +287,7 @@
 	uint32_t need;
 	uint64_t allocated;
 	uint64_t leading_space;
-	SystemFileDiskRecord *tmprec, *tmprec2;
+	SystemFileDiskRecord *tmprec;
 	char fname[SYSTEM_FILE_NAME_MAX];
 
 	setbuf(stdout, NULL);
@@ -354,20 +350,20 @@
 					  &global_alloc_rec);
 
 	tmprec = &(record[GLOBAL_INODE_ALLOC_SYSTEM_INODE][0]);
-	tmprec2 = &(record[GLOBAL_INODE_ALLOC_BITMAP_SYSTEM_INODE][0]);
 	need = blocks_needed(s);
 
 	alloc_bytes_from_bitmap (s, need << s->blocksize_bits, s->global_bm,
-				 &(tmprec->extent_off), &(tmprec->extent_len));
+				 &(crap_rec.extent_off), &(crap_rec.extent_len));
 
+
 	need = ((((need + 7) >> 3) + s->cluster_size - 1) >> s->cluster_size_bits) << s->cluster_size_bits;
-	alloc_bytes_from_bitmap (s, need, s->global_bm, &(tmprec2->extent_off),
-	                         &(tmprec2->extent_len));
+	alloc_bytes_from_bitmap (s, need, s->global_bm, &(tmprec->extent_off),
+	                         &(tmprec->extent_len));
 
 	s->system_bm =
-		initialize_bitmap(s, tmprec->extent_len >> s->blocksize_bits,
+		initialize_bitmap(s, crap_rec.extent_len >> s->blocksize_bits,
 				  s->blocksize_bits, "system inode bitmap",
-				  tmprec2, tmprec);
+				  tmprec, &crap_rec);
 
 	if (!s->quiet)
 		printf("done\n");
@@ -384,12 +380,12 @@
 	}
 
 	superblock_rec.fe_off = alloc_inode(s, SUPERBLOCK_BLOCKS);
-	if (superblock_rec.fe_off != (__u64)MAGIC_SUPERBLOCK_BLOCK_NUMBER << s->blocksize_bits) {
+	if (superblock_rec.fe_off != (__u64)OCFS2_SUPER_BLOCK_BLKNO << s->blocksize_bits) {
 		com_err(s->progname, 0,
 			"Superblock starts at byte %"PRIu64", "
 			"must start at %"PRIu64"",
 			superblock_rec.fe_off,
-			(uint64_t)MAGIC_SUPERBLOCK_BLOCK_NUMBER << 
+			(uint64_t)OCFS2_SUPER_BLOCK_BLKNO << 
 			s->blocksize_bits);
 		exit(1);
 	}
@@ -1177,7 +1173,7 @@
 	free(di);
 }
 
-static inline int 
+static int 
 ocfs2_clusters_per_group(int block_size, int cluster_size_bits)
 {
 	int bytes;