New patch to review for filo: 0ce2bc9 Fix compilation of fsys_ext2 with debugging

[Nico Huber]

Nico Huber ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3297

-gerrit

commit 0ce2bc92eda2a0465ea5a6afb8b70cb3c9bd70ce
Author: Nico Huber 
Date:   Sun May 26 14:26:52 2013 +0200

Fix compilation of fsys_ext2 with debugging

With time some changes to fsys_ext2 didn't make it into the debugging
    code. So track those changes.

Change-Id: I576eaa2d481d45c178f3b1f51298dfa9a9061bbb
    Signed-off-by: Nico Huber 
---
 fs/fsys_ext2fs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/fsys_ext2fs.c b/fs/fsys_ext2fs.c
index 93a3ee6..987dceb 100644
--- a/fs/fsys_ext2fs.c
+++ b/fs/fsys_ext2fs.c
@@ -341,7 +341,7 @@ struct ext4_extent_header
 #define SUPERBLOCK \
     ((struct ext2_super_block *)(FSYS_BUF))
 #define GROUP_DESC \
-    ((struct ext2_group_desc *) \
+    ((struct ext4_group_desc *) \
      ((char *)SUPERBLOCK + sizeof(struct ext2_super_block)))
 #define INODE \
     ((struct ext2_inode *)((char *)GROUP_DESC + EXT2_BLOCK_SIZE(SUPERBLOCK)))
@@ -401,14 +401,14 @@ dump_super(struct ext2_super_block *s)
     printf("  first=%d\n", le32_to_cpu(s->s_first_data_block));
     printf("  log_b_size=%d, b_size=%d\n", le32_to_cpu(s->s_log_block_size), EXT2_BLOCK_SIZE(s));
     printf("  inode_size=%d\n", le32_to_cpu(EXT2_INODE_SIZE(s)));
-    printf("  log_f_size=%d\n", le32_to_cpu(s->s_log_frag_size));
+    printf("  (obsoleted) log_f_size=%d\n", le32_to_cpu(s->s_obso_log_frag_size));
     printf("  bpg=%d\n", le32_to_cpu(s->s_blocks_per_group));
-    printf("  fpg=%d\n", le32_to_cpu(s->s_frags_per_group));
+    printf("  (obsoleted) fpg=%d\n", le32_to_cpu(s->s_obso_frags_per_group));
     printf("  ipg=%d\n", le32_to_cpu(s->s_inodes_per_group));
 }

void
-dump_group_desc(struct ext2_group_desc *g)
+dump_group_desc(struct ext4_group_desc *g)
 {
     printf(" group_desc 0x%p:\n", g);
     printf("  b_bmap block=%d\n", le32_to_cpu(g->bg_block_bitmap));