[Ocfs-tools-commits] jlbec commits r87 - in trunk/ocfs2: libocfs2/include mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-21 19:55:08 -0500 (Mon, 21 Jun 2004)
New Revision: 87

Modified:
   trunk/ocfs2/libocfs2/include/ocfs2_fs.h
   trunk/ocfs2/mkfs.ocfs2/mkfs2.c
Log:

o On-disk version 0.9 in ocfs2_fs.h



Modified: trunk/ocfs2/libocfs2/include/ocfs2_fs.h
===================================================================
--- trunk/ocfs2/libocfs2/include/ocfs2_fs.h	2004-06-22 00:26:08 UTC (rev 86)
+++ trunk/ocfs2/libocfs2/include/ocfs2_fs.h	2004-06-22 00:55:08 UTC (rev 87)
@@ -29,8 +29,8 @@
 #define _OCFS2_FS_H
 
 /* Version */
-#define OCFS2_MAJOR_REV_LEVEL		2
-#define OCFS2_MINOR_REV_LEVEL          	0
+#define OCFS2_MAJOR_REV_LEVEL		0
+#define OCFS2_MINOR_REV_LEVEL          	90
 
 /*
  * An OCFS2 volume starts this way:

Modified: trunk/ocfs2/mkfs.ocfs2/mkfs2.c
===================================================================
--- trunk/ocfs2/mkfs.ocfs2/mkfs2.c	2004-06-22 00:26:08 UTC (rev 86)
+++ trunk/ocfs2/mkfs.ocfs2/mkfs2.c	2004-06-22 00:55:08 UTC (rev 87)
@@ -112,12 +112,9 @@
 
 system_file_info system_files[] = {
 	{ "bad_blocks", sfi_other, 1, 0 },
-	{ "global_bitmap", sfi_bitmap, 1, 0 },
 	{ "global_inode_alloc", sfi_other, 1, 0 },
 	{ "global_inode_alloc_bitmap", sfi_bitmap, 1, 0 },
-	//{ "autoconfig", sfi_other, 1, 0 },
-	//{ "publish", sfi_other, 1, 0 },
-	//{ "vote", sfi_other, 1, 0 },
+	{ "global_bitmap", sfi_bitmap, 1, 0 },
 	{ "dlm", sfi_dlm, 1, 0 },
 	{ "orphan_dir", sfi_other, 1, 1 },
 	{ "extent_alloc:%04d", sfi_other, 0, 0 },
@@ -1147,8 +1144,8 @@
 	need = (AUTOCONF_BLOCKS(initial_nodes, 32) +
 		PUBLISH_BLOCKS(initial_nodes, 32) + 
 		VOTE_BLOCKS(initial_nodes, 32));
-	tmprec->extent_off = alloc_inode(need);
-	tmprec->file_size = tmprec->extent_len = need << blocksize_bits;
+        alloc_from_bitmap(need, global_bm, &tmprec->extent_off, &tmprec->extent_len);
+	tmprec->file_size = need << blocksize_bits;
 
 
 	/* orphan dir */