[U-Boot] [PATCH] Fix ext2 non-working

[unsik Kim]

Hello, all?

Currently ext2ls, ext2load not working (I think sometimes it will work.)
The reason is incorrect operations of ext2fs_read_inode and ext2fs_blockgroup.

I fix miscalculated block number(blkno) and offset (blkoff), and some
hard coded values.

unsik Kim

Signed-off-by: unsik Kim <donari75 at gmail.com>
---
diff --git a/Makefile b/Makefile
index d26a004..9e9ba36 100644
--- a/Makefile
+++ b/Makefile
@@ -403,6 +403,7 @@ TAG_SUBDIRS += fs/fat
 TAG_SUBDIRS += fs/fdos
 TAG_SUBDIRS += fs/jffs2
 TAG_SUBDIRS += fs/yaffs2
+TAG_SUBDIRS += fs/ext2
 TAG_SUBDIRS += net
 TAG_SUBDIRS += disk
 TAG_SUBDIRS += common
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index 436f4a4..4ac2bdd 100644
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -110,6 +110,7 @@ struct ext2_block_group {
 	uint32_t inode_table_id;
 	uint16_t free_blocks;
 	uint16_t free_inodes;
+	uint16_t used_dir_cnt;
 	uint16_t pad;
 	uint32_t reserved[3];
 };
@@ -182,14 +183,22 @@ int indir2_blkno = -1;

 static int ext2fs_blockgroup
 	(struct ext2_data *data, int group, struct ext2_block_group *blkgrp) {
+	unsigned int blkno;
+	unsigned int blkoff;
+	unsigned int desc_per_blk;
+
+	desc_per_blk = EXT2_BLOCK_SIZE(data) / sizeof(struct ext2_block_group);
+
+	blkno = __le32_to_cpu(data->sblock.first_data_block) + 1 +
+		group / desc_per_blk;
+	blkoff = (group % desc_per_blk) * sizeof(struct ext2_block_group);
 #ifdef DEBUG
-	printf ("ext2fs read blockgroup\n");
+	printf ("ext2fs read %d group descriptor (blkno %d blkoff %d)\n",
+		 group, blkno, blkoff);
 #endif
 	return (ext2fs_devread
-		(((__le32_to_cpu (data->sblock.first_data_block) +
-		   1) << LOG2_EXT2_BLOCK_SIZE (data)),
-		 group * sizeof (struct ext2_block_group),
-		 sizeof (struct ext2_block_group), (char *) blkgrp));
+		(blkno << LOG2_EXT2_BLOCK_SIZE(data),
+		 blkoff, sizeof(struct ext2_block_group), (char *)blkgrp));
 }


@@ -203,11 +212,11 @@ static int ext2fs_read_inode
 	unsigned int blkno;
 	unsigned int blkoff;

-	/* It is easier to calculate if the first inode is 0.  */
-	ino--;
 #ifdef DEBUG
 	printf ("ext2fs read inode %d\n", ino);
 #endif
+	/* It is easier to calculate if the first inode is 0.  */
+	ino--;
 	status = ext2fs_blockgroup (data,
 				    ino /
 				    __le32_to_cpu (sblock->inodes_per_group),
@@ -215,19 +224,16 @@ static int ext2fs_read_inode
 	if (status == 0) {
 		return (0);
 	}
-	inodes_per_block = EXT2_BLOCK_SIZE (data) / 128;
-	blkno = (ino % __le32_to_cpu (sblock->inodes_per_group)) /
-		inodes_per_block;
-	blkoff = (ino % __le32_to_cpu (sblock->inodes_per_group)) %
-		inodes_per_block;
+	inodes_per_block = EXT2_BLOCK_SIZE(data) / __le32_to_cpu(sblock->inode_size);
+	blkno = blkgrp.inode_table_id +
+		(ino % __le32_to_cpu(sblock->inodes_per_group)) / inodes_per_block;
+	blkoff = (ino % inodes_per_block) * __le32_to_cpu(sblock->inode_size);
 #ifdef DEBUG
 	printf ("ext2fs read inode blkno %d blkoff %d\n", blkno, blkoff);
 #endif
 	/* Read the inode.  */
-	status = ext2fs_devread (((__le32_to_cpu (blkgrp.inode_table_id) +
-				   blkno) << LOG2_EXT2_BLOCK_SIZE (data)),
-				 sizeof (struct ext2_inode) * blkoff,
-				 sizeof (struct ext2_inode), (char *) inode);
+	status = ext2fs_devread (blkno << LOG2_EXT2_BLOCK_SIZE (data), blkoff,
+				sizeof (struct ext2_inode), (char *) inode);
 	if (status == 0) {
 		return (0);
 	}