Index: linux-2.6.19-rc6/fs/ext4/mballoc.c
===================================================================
--- linux-2.6.19-rc6.orig/fs/ext4/mballoc.c	2006-12-07 17:54:01.000000000 +0100
+++ linux-2.6.19-rc6/fs/ext4/mballoc.c	2006-12-07 19:19:11.000000000 +0100
@@ -745,7 +745,7 @@ static int ext4_mb_init_cache(struct pag
 			goto out;
 
 		err = -ENOMEM;
-		bh[i] = sb_getblk(sb, le32_to_cpu(desc->bg_block_bitmap));
+		bh[i] = sb_getblk(sb, ext4_block_bitmap(sb, desc));
 		if (bh[i] == NULL)
 			goto out;
 
@@ -2794,9 +2794,9 @@ int ext4_mb_mark_diskspace_used(struct e
 		+ ac->ac_b_ex.fe_start
 		+ le32_to_cpu(es->s_first_data_block);
 
-	if (block == le32_to_cpu(gdp->bg_block_bitmap) ||
-			block == le32_to_cpu(gdp->bg_inode_bitmap) ||
-			in_range(block, le32_to_cpu(gdp->bg_inode_table),
+	if (block == ext4_block_bitmap(sb, gdp) ||
+			block == ext4_inode_bitmap(sb, gdp) ||
+			in_range(block, ext4_inode_table(sb, gdp),
 				EXT4_SB(sb)->s_itb_per_group))
 		ext4_error(sb, "ext4_new_block",
 				"Allocating block in system zone - block = %lu",
@@ -3837,11 +3837,11 @@ do_more:
 	if (!gdp)
 		goto error_return;
 
-	if (in_range (le32_to_cpu(gdp->bg_block_bitmap), block, count) ||
-			in_range (le32_to_cpu(gdp->bg_inode_bitmap), block, count) ||
-			in_range (block, le32_to_cpu(gdp->bg_inode_table),
+	if (in_range (ext4_block_bitmap(sb, gdp), block, count) ||
+			in_range (ext4_inode_bitmap(sb, gdp), block, count) ||
+			in_range (block, ext4_inode_table(sb, gdp),
 				EXT4_SB(sb)->s_itb_per_group) ||
-			in_range (block + count - 1, le32_to_cpu(gdp->bg_inode_table),
+			in_range (block + count - 1, ext4_inode_table(sb, gdp),
 				EXT4_SB(sb)->s_itb_per_group))
 		ext4_error (sb, "ext4_free_blocks",
 				"Freeing blocks in system zones - "