[Ocfs2-tools-commits] smushran commits r430 - in trunk: libocfs2 tunefs.ocfs2

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2004-11-19 18:53:28 -0600 (Fri, 19 Nov 2004)
New Revision: 430

Modified:
   trunk/libocfs2/alloc.c
   trunk/libocfs2/chainalloc.c
   trunk/tunefs.ocfs2/tunefs.c
Log:
suballocnode set correctly during init_inode

Modified: trunk/libocfs2/alloc.c
===================================================================
--- trunk/libocfs2/alloc.c	2004-11-20 00:49:40 UTC (rev 429)
+++ trunk/libocfs2/alloc.c	2004-11-20 00:53:28 UTC (rev 430)
@@ -96,14 +96,14 @@
 	return 0;
 }
 
-static void ocfs2_init_inode(ocfs2_filesys *fs, ocfs2_dinode *di,
+static void ocfs2_init_inode(ocfs2_filesys *fs, ocfs2_dinode *di, int16_t node,
 			     uint64_t gd_blkno, uint64_t blkno)
 {
 	ocfs2_extent_list *fel;
 
 	di->i_generation = fs->fs_super->i_generation;
 	di->i_blkno = blkno;
-	di->i_suballoc_node = 0;
+	di->i_suballoc_node = node;
 	di->i_suballoc_bit = (uint16_t)(blkno - gd_blkno);
 	di->i_uid = di->i_gid = 0;
 	if (S_ISDIR(di->i_mode))
@@ -155,7 +155,7 @@
 	memset(buf, 0, fs->fs_blocksize);
 	di = (ocfs2_dinode *)buf;
 	di->i_mode = mode;
-	ocfs2_init_inode(fs, di, gd_blkno, *ino);
+	ocfs2_init_inode(fs, di, 0, gd_blkno, *ino);
 
 	ret = ocfs2_write_inode(fs, *ino, buf);
 
@@ -191,7 +191,7 @@
 	di = (ocfs2_dinode *)buf;
 	di->i_mode = mode;
 	di->i_flags = flags;
-	ocfs2_init_inode(fs, di, gd_blkno, *ino);
+	ocfs2_init_inode(fs, di, -1, gd_blkno, *ino);
 	di->i_flags |= OCFS2_SYSTEM_FL;
 	di->i_fs_generation = fs->fs_super->i_fs_generation;
 

Modified: trunk/libocfs2/chainalloc.c
===================================================================
--- trunk/libocfs2/chainalloc.c	2004-11-20 00:49:40 UTC (rev 429)
+++ trunk/libocfs2/chainalloc.c	2004-11-20 00:53:28 UTC (rev 430)
@@ -377,6 +377,7 @@
 	ctxt.target_bit = *bitno;
 	ret = ocfs2_bitmap_foreach_region(cinode->ci_chains,
 					  chainalloc_find_desc, &ctxt);
+	*gd_blkno = ctxt.gd_blkno;
 
 	ret = ocfs2_bitmap_set(cinode->ci_chains, *bitno, &oldval);
 	if (ret)

Modified: trunk/tunefs.ocfs2/tunefs.c
===================================================================
--- trunk/tunefs.ocfs2/tunefs.c	2004-11-20 00:49:40 UTC (rev 429)
+++ trunk/tunefs.ocfs2/tunefs.c	2004-11-20 00:53:28 UTC (rev 430)
@@ -294,13 +294,13 @@
 
 			/* Add the inode to the system dir */
 			ret = ocfs2_link(fs, fs->fs_sysdir_blkno, fname,
-					 blkno, S_IFREG);
+					 blkno, OCFS2_FT_REG_FILE);
 			if (ret) {
 				if (ret == OCFS2_ET_DIR_NO_SPACE) {
 					ret = ocfs2_expand_dir(fs, fs->fs_sysdir_blkno);
 					if (!ret)
 						ret = ocfs2_link(fs, fs->fs_sysdir_blkno,
-								 fname, blkno, S_IFREG);
+								 fname, blkno, OCFS2_FT_REG_FILE);
 				}
 				if (ret)
 					goto bail;