mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 20:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

ext4: determine group descriptor size for 64bit feature

Browse Source 
If EXT4_FEATURE_INCOMPAT_64BIT is set, the descriptor can be read from
the superblocks, otherwise it defaults to 32.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
This commit is contained in:
Stefan Brüns 2016-09-17 02:10:07 +02:00 committed by Tom Rini
parent 3ee2f977f3
commit fc214ef909
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/ext4/ext4_common.c
View File

@ -2233,13 +2233,23 @@ int ext4fs_mount(unsigned part_length)
goto fail;
}
if (le32_to_cpu(data->sblock.revision_level) == 0)
if (le32_to_cpu(data->sblock.revision_level) == 0) {
fs->inodesz = 128;
else
fs->inodesz = le16_to_cpu(data->sblock.inode_size);
} else {
debug("EXT4 features COMPAT: %08x INCOMPAT: %08x RO_COMPAT: %08x\n",
__le32_to_cpu(data->sblock.feature_compatibility),
__le32_to_cpu(data->sblock.feature_incompat),
__le32_to_cpu(data->sblock.feature_ro_compat));
debug("EXT2 rev %d, inode_size %d\n",
le32_to_cpu(data->sblock.revision_level), fs->inodesz);
fs->inodesz = le16_to_cpu(data->sblock.inode_size);
fs->gdsize = le32_to_cpu(data->sblock.feature_incompat) &
EXT4_FEATURE_INCOMPAT_64BIT ?
le16_to_cpu(data->sblock.descriptor_size) : 32;
}
debug("EXT2 rev %d, inode_size %d, descriptor size %d\n",
le32_to_cpu(data->sblock.revision_level),
fs->inodesz, fs->gdsize);
data->diropen.data = data;
data->diropen.ino = 2;

2
include/ext4fs.h
View File

@ -87,6 +87,8 @@ struct ext_filesystem {
uint32_t inodesz;
/* Sectors per Block */
uint32_t sect_perblk;
/* Group Descriptor size */
uint16_t gdsize;
/* Group Descriptor Block Number */
uint32_t gdtable_blkno;
/* Total block groups of partition */