Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Make ext2 fs work with block sizes != 1024

This commit is contained in:
Bananymous 2023-12-10 01:32:30 +02:00
parent a6bfbbf655
commit 2f8759d2d3
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/kernel/FS/Ext2/FileSystem.cpp
View File

@ -106,7 +106,8 @@ namespace Kernel
else else
{ {
// In other revision superblock backups are on blocks 1 and powers of 3, 5 and 7 // In other revision superblock backups are on blocks 1 and powers of 3, 5 and 7
TRY(m_superblock_backups.push_back(1)); if (1 < number_of_block_groups)
TRY(m_superblock_backups.push_back(1));
for (uint32_t i = 3; i < number_of_block_groups; i *= 3) for (uint32_t i = 3; i < number_of_block_groups; i *= 3)
TRY(m_superblock_backups.push_back(i)); TRY(m_superblock_backups.push_back(i));
for (uint32_t i = 5; i < number_of_block_groups; i *= 5) for (uint32_t i = 5; i < number_of_block_groups; i *= 5)
@ -275,11 +276,10 @@ namespace Kernel
const uint32_t sector_size = m_block_device->blksize(); const uint32_t sector_size = m_block_device->blksize();
const uint32_t block_size = this->block_size(); const uint32_t block_size = this->block_size();
const uint32_t sectors_per_block = block_size / sector_size; const uint32_t sectors_per_block = block_size / sector_size;
const uint32_t sectors_before = 2048 / sector_size;
ASSERT(block >= 2); ASSERT(block >= superblock().first_data_block + 1);
ASSERT(buffer.size() >= block_size); ASSERT(buffer.size() >= block_size);
MUST(m_block_device->read_blocks(sectors_before + (block - 2) * sectors_per_block, sectors_per_block, buffer.span())); MUST(m_block_device->read_blocks(block * sectors_per_block, sectors_per_block, buffer.span()));
} }
void Ext2FS::write_block(uint32_t block, const BlockBufferWrapper& buffer) void Ext2FS::write_block(uint32_t block, const BlockBufferWrapper& buffer)
@ -289,11 +289,10 @@ namespace Kernel
const uint32_t sector_size = m_block_device->blksize(); const uint32_t sector_size = m_block_device->blksize();
const uint32_t block_size = this->block_size(); const uint32_t block_size = this->block_size();
const uint32_t sectors_per_block = block_size / sector_size; const uint32_t sectors_per_block = block_size / sector_size;
const uint32_t sectors_before = 2048 / sector_size;
ASSERT(block >= 2); ASSERT(block >= superblock().first_data_block + 1);
ASSERT(buffer.size() >= block_size); ASSERT(buffer.size() >= block_size);
MUST(m_block_device->write_blocks(sectors_before + (block - 2) * sectors_per_block, sectors_per_block, buffer.span())); MUST(m_block_device->write_blocks(block * sectors_per_block, sectors_per_block, buffer.span()));
} }
void Ext2FS::sync_superblock() void Ext2FS::sync_superblock()
@ -472,9 +471,8 @@ namespace Kernel
const uint32_t block_group_count = BAN::Math::div_round_up(superblock().inodes_count, superblock().inodes_per_group); const uint32_t block_group_count = BAN::Math::div_round_up(superblock().inodes_count, superblock().inodes_per_group);
ASSERT(group_index < block_group_count); ASSERT(group_index < block_group_count);
// Block Group Descriptor table is always after the superblock // Block Group Descriptor table is in the block after superblock
// Superblock begins at byte 1024 and is exactly 1024 bytes wide const uint32_t bgd_byte_offset = (superblock().first_data_block + 1) * block_size + sizeof(Ext2::BlockGroupDescriptor) * group_index;
const uint32_t bgd_byte_offset = 2048 + sizeof(Ext2::BlockGroupDescriptor) * group_index;
return return
{ {

2
script/image-create.sh
View File

@ -87,7 +87,7 @@ sudo partprobe $LOOP_DEV
PARTITION1=${LOOP_DEV}p1 PARTITION1=${LOOP_DEV}p1
PARTITION2=${LOOP_DEV}p2 PARTITION2=${LOOP_DEV}p2
sudo mkfs.ext2 -b 1024 -q $PARTITION2 sudo mkfs.ext2 -q $PARTITION2
sudo mkdir -p $MOUNT_DIR || { echo "Failed to create banan mount dir."; exit 1; } sudo mkdir -p $MOUNT_DIR || { echo "Failed to create banan mount dir."; exit 1; }