mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 15:40:29 +09:00
Fix ext4 block group descriptor sizing
Ext4 allows for arbitrarily sized block group descriptors when 64-bit addressing is enabled, which was previously not properly supported. This patch dynamically allocates a chunk of memory of the correct size. Signed-off-by: Benjamin Lim <jarsp.ctf@gmail.com>
This commit is contained in:
parent
e551979790
commit
febbc58331
@ -1587,7 +1587,7 @@ static int ext4fs_blockgroup
|
|||||||
|
|
||||||
int ext4fs_read_inode(struct ext2_data *data, int ino, struct ext2_inode *inode)
|
int ext4fs_read_inode(struct ext2_data *data, int ino, struct ext2_inode *inode)
|
||||||
{
|
{
|
||||||
struct ext2_block_group blkgrp;
|
struct ext2_block_group *blkgrp;
|
||||||
struct ext2_sblock *sblock = &data->sblock;
|
struct ext2_sblock *sblock = &data->sblock;
|
||||||
struct ext_filesystem *fs = get_fs();
|
struct ext_filesystem *fs = get_fs();
|
||||||
int log2blksz = get_fs()->dev_desc->log2blksz;
|
int log2blksz = get_fs()->dev_desc->log2blksz;
|
||||||
@ -1595,17 +1595,28 @@ int ext4fs_read_inode(struct ext2_data *data, int ino, struct ext2_inode *inode)
|
|||||||
long int blkno;
|
long int blkno;
|
||||||
unsigned int blkoff;
|
unsigned int blkoff;
|
||||||
|
|
||||||
|
/* Allocate blkgrp based on gdsize (for 64-bit support). */
|
||||||
|
blkgrp = zalloc(get_fs()->gdsize);
|
||||||
|
if (!blkgrp)
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* It is easier to calculate if the first inode is 0. */
|
/* It is easier to calculate if the first inode is 0. */
|
||||||
ino--;
|
ino--;
|
||||||
status = ext4fs_blockgroup(data, ino / le32_to_cpu
|
status = ext4fs_blockgroup(data, ino / le32_to_cpu
|
||||||
(sblock->inodes_per_group), &blkgrp);
|
(sblock->inodes_per_group), blkgrp);
|
||||||
if (status == 0)
|
if (status == 0) {
|
||||||
|
free(blkgrp);
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
inodes_per_block = EXT2_BLOCK_SIZE(data) / fs->inodesz;
|
inodes_per_block = EXT2_BLOCK_SIZE(data) / fs->inodesz;
|
||||||
blkno = ext4fs_bg_get_inode_table_id(&blkgrp, fs) +
|
blkno = ext4fs_bg_get_inode_table_id(blkgrp, fs) +
|
||||||
(ino % le32_to_cpu(sblock->inodes_per_group)) / inodes_per_block;
|
(ino % le32_to_cpu(sblock->inodes_per_group)) / inodes_per_block;
|
||||||
blkoff = (ino % inodes_per_block) * fs->inodesz;
|
blkoff = (ino % inodes_per_block) * fs->inodesz;
|
||||||
|
|
||||||
|
/* Free blkgrp as it is no longer required. */
|
||||||
|
free(blkgrp);
|
||||||
|
|
||||||
/* Read the inode. */
|
/* Read the inode. */
|
||||||
status = ext4fs_devread((lbaint_t)blkno << (LOG2_BLOCK_SIZE(data) -
|
status = ext4fs_devread((lbaint_t)blkno << (LOG2_BLOCK_SIZE(data) -
|
||||||
log2blksz), blkoff,
|
log2blksz), blkoff,
|
||||||
|
Loading…
Reference in New Issue
Block a user