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

Kernel: Don't lock Ext2FS while reading and writing blocks

Browse Source 
There is really no reason for this. The underlying block devices are
(should be) thread safe themselves
This commit is contained in:
Bananymous
2026-05-09 21:38:18 +03:00
parent 0bf7328e04
commit 5f237abc3b
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,31 +307,27 @@ namespace Kernel
BAN::ErrorOr<void> Ext2FS::read_block(uint32_t block, BlockBufferWrapper& buffer) BAN::ErrorOr<void> Ext2FS::read_block(uint32_t block, BlockBufferWrapper& buffer)
{ {
LockGuard _(m_mutex);
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;
ASSERT(block >= superblock().first_data_block + 1); ASSERT(block >= superblock().first_data_block + 1);
ASSERT(buffer.size() >= block_size); ASSERT(buffer.size() >= block_size);
TRY(m_block_device->read_blocks(block * sectors_per_block, sectors_per_block, buffer.span()));
TRY(m_block_device->read_blocks(block * sectors_per_block, sectors_per_block, buffer.span()));
return {}; return {};
} }
BAN::ErrorOr<void> Ext2FS::write_block(uint32_t block, const BlockBufferWrapper& buffer) BAN::ErrorOr<void> Ext2FS::write_block(uint32_t block, const BlockBufferWrapper& buffer)
{ {
LockGuard _(m_mutex);
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;
ASSERT(block >= superblock().first_data_block + 1); ASSERT(block >= superblock().first_data_block + 1);
ASSERT(buffer.size() >= block_size); ASSERT(buffer.size() >= block_size);
TRY(m_block_device->write_blocks(block * sectors_per_block, sectors_per_block, buffer.span()));
TRY(m_block_device->write_blocks(block * sectors_per_block, sectors_per_block, buffer.span()));
return {}; return {};
} }
@@ -339,8 +335,6 @@ namespace Kernel
{ {
auto superblock_buffer = TRY(get_block_buffer()); auto superblock_buffer = TRY(get_block_buffer());
LockGuard _(m_mutex);
const uint32_t sector_size = m_block_device->blksize(); const uint32_t sector_size = m_block_device->blksize();
ASSERT(1024 % sector_size == 0); ASSERT(1024 % sector_size == 0);
@@ -364,8 +358,6 @@ namespace Kernel
BAN::ErrorOr<void> Ext2FS::sync_block(uint32_t block) BAN::ErrorOr<void> Ext2FS::sync_block(uint32_t block)
{ {
LockGuard _(m_mutex);
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;