PERFORCE change 163992 for review

[Aditya Sarawgi]

http://perforce.freebsd.org/chv.cgi?CH=163992

Change 163992 by truncs at aditya on 2009/06/10 13:57:53

	Migrated to the new on disk superblock

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#5 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#5 (text+ko) ====

@@ -110,12 +110,12 @@
 	if (cred == NOCRED)
 		panic("ext2_alloc: missing credential");
 #endif /* DIAGNOSTIC */
-	if (size == fs->e2fs_bsize && fs->e2fs->s_free_blocks_count == 0)
+	if (size == fs->e2fs_bsize && fs->e2fs->e2fs_fbcount == 0)
 		goto nospace;
 	if (cred->cr_uid != 0 && 
-		fs->e2fs->s_free_blocks_count < fs->e2fs->s_r_blocks_count)
+		fs->e2fs->e2fs_fbcount < fs->e2fs->e2fs_rbcount)
 		goto nospace;
-	if (bpref >= fs->e2fs->s_blocks_count)
+	if (bpref >= fs->e2fs->e2fs_bcount)
 		bpref = 0;
 	/* call the Linux code */
 #ifdef EXT2_PREALLOCATE
@@ -457,7 +457,7 @@
 	return blocknr ? blocknr :
 			(int32_t)(ip->i_block_group * 
 			EXT2_BLOCKS_PER_GROUP(ip->i_e2fs)) + 
-			ip->i_e2fs->e2fs->s_first_data_block;
+			ip->i_e2fs->e2fs->e2fs_first_dblock;
 }
 
 /*