qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-01 14:14:38 +02:00
Code

qi-fix-ryan-chen-dynamic-inode-size.patch

Browse Source 
With large SDHC cards, the ext2/3 filesystem put on large partitions
by mkfs.ext2/3 is not how it used to be, it has a dynamic multiplier for
its block addressing.  Without these changes, based on a patch by Ryan
Chen

http://lists.denx.de/pipermail/u-boot/2008-July/037786.html

we cannot parse large ext3 filesystem.

Signed-off-by: Andy Green <andy@openmoko.com>
This commit is contained in:
Andy Green 2008-11-28 10:16:38 +00:00 committed by Andy Green
parent bcdb949182
commit c4e54f889f
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qiboot/src/fs/ext2.c
View File

@ -65,6 +65,12 @@ extern int ext2fs_devread(int sector, int byte_offset, int byte_len,
/* The size of an ext2 block in bytes. */ /* The size of an ext2 block in bytes. */
#define EXT2_BLOCK_SIZE(data) (1 << LOG2_BLOCK_SIZE(data)) #define EXT2_BLOCK_SIZE(data) (1 << LOG2_BLOCK_SIZE(data))
#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */
#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */
#define EXT2_GOOD_OLD_INODE_SIZE 128
uint32_t ext2_inode_size = EXT2_GOOD_OLD_INODE_SIZE;
/* The ext2 superblock. */ /* The ext2 superblock. */
struct ext2_sblock { struct ext2_sblock {
uint32_t total_inodes; uint32_t total_inodes;
@ -216,7 +222,7 @@ static int ext2fs_read_inode
if (status == 0) if (status == 0)
return 0; return 0;
inodes_per_block = EXT2_BLOCK_SIZE(data) / 128; inodes_per_block = EXT2_BLOCK_SIZE(data) / ext2_inode_size;
blkno =(ino % __le32_to_cpu(sblock->inodes_per_group)) / blkno =(ino % __le32_to_cpu(sblock->inodes_per_group)) /
inodes_per_block; inodes_per_block;
blkoff =(ino % __le32_to_cpu(sblock->inodes_per_group)) % blkoff =(ino % __le32_to_cpu(sblock->inodes_per_group)) %
@ -225,9 +231,9 @@ static int ext2fs_read_inode
puts("ext2fs read inode blkno %d blkoff %d\n", blkno, blkoff); puts("ext2fs read inode blkno %d blkoff %d\n", blkno, blkoff);
#endif #endif
/* Read the inode. */ /* Read the inode. */
status = ext2fs_devread(((__le32_to_cpu(blkgrp.inode_table_id) + status = ext2fs_devread((__le32_to_cpu(blkgrp.inode_table_id) +
blkno) << LOG2_EXT2_BLOCK_SIZE(data)), blkno) << LOG2_EXT2_BLOCK_SIZE(data),
sizeof(struct ext2_inode) * blkoff, ext2_inode_size * blkoff,
sizeof(struct ext2_inode),(char *) inode); sizeof(struct ext2_inode),(char *) inode);
return !!status; return !!status;
@ -867,6 +873,11 @@ int ext2fs_mount(void) {
if (__le16_to_cpu(data->sblock.magic) != EXT2_MAGIC) if (__le16_to_cpu(data->sblock.magic) != EXT2_MAGIC)
goto fail; goto fail;
if (__le32_to_cpu(data->sblock.revision_level) == EXT2_GOOD_OLD_REV)
ext2_inode_size = EXT2_GOOD_OLD_INODE_SIZE;
else
ext2_inode_size = __le16_to_cpu (data->sblock.inode_size);
data->diropen.data = data; data->diropen.data = data;
data->diropen.ino = 2; data->diropen.ino = 2;
data->diropen.inode_read = 1; data->diropen.inode_read = 1;