mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 23:07:35 +00:00
Kernel/FileSystem: Rename logical_block_size -> device_block_size
This never was a logical block size, it always was a device specific block size. Ideally the block size would change in accordance to whatever the driver wants to use, but that is a change for the future. For now, let's get rid of this confusing naming.
This commit is contained in:
parent
bf1610d378
commit
d1e6e6110d
8 changed files with 41 additions and 41 deletions
|
@ -78,8 +78,8 @@ bool ISO9660DirectoryIterator::skip()
|
|||
// need to snap to the next logical block, because directory records
|
||||
// cannot span multiple logical blocks.
|
||||
u32 remaining_bytes = m_current_directory.entry->length - m_current_directory.offset;
|
||||
if (remaining_bytes > m_fs.logical_block_size()) {
|
||||
m_current_directory.offset += remaining_bytes % m_fs.logical_block_size();
|
||||
if (remaining_bytes > m_fs.device_block_size()) {
|
||||
m_current_directory.offset += remaining_bytes % m_fs.device_block_size();
|
||||
get_header();
|
||||
|
||||
dbgln_if(ISO9660_VERY_DEBUG, "skip(): Snapped to next logical block (succeeded)");
|
||||
|
|
|
@ -25,7 +25,7 @@ ISO9660FS::ISO9660FS(OpenFileDescription& description)
|
|||
: BlockBasedFileSystem(description)
|
||||
{
|
||||
set_block_size(logical_sector_size);
|
||||
m_logical_block_size = logical_sector_size;
|
||||
m_device_block_size = logical_sector_size;
|
||||
}
|
||||
|
||||
ISO9660FS::~ISO9660FS() = default;
|
||||
|
@ -91,7 +91,7 @@ ErrorOr<void> ISO9660FS::parse_volume_set()
|
|||
{
|
||||
VERIFY(!m_primary_volume);
|
||||
|
||||
auto block = TRY(KBuffer::try_create_with_size("ISO9660FS: Temporary volume descriptor storage"sv, m_logical_block_size, Memory::Region::Access::Read | Memory::Region::Access::Write));
|
||||
auto block = TRY(KBuffer::try_create_with_size("ISO9660FS: Temporary volume descriptor storage"sv, m_device_block_size, Memory::Region::Access::Read | Memory::Region::Access::Write));
|
||||
auto block_buffer = UserOrKernelBuffer::for_kernel_buffer(block->data());
|
||||
|
||||
auto current_block_index = first_data_area_block;
|
||||
|
@ -136,7 +136,7 @@ all_headers_read:
|
|||
return EIO;
|
||||
}
|
||||
|
||||
m_logical_block_size = LittleEndian { m_primary_volume->logical_block_size.little };
|
||||
m_device_block_size = LittleEndian { m_primary_volume->logical_block_size.little };
|
||||
return {};
|
||||
}
|
||||
|
||||
|
@ -242,14 +242,14 @@ ErrorOr<NonnullLockRefPtr<ISO9660FSDirectoryEntry>> ISO9660FS::directory_entry_f
|
|||
m_directory_entry_cache.remove(m_directory_entry_cache.begin());
|
||||
}
|
||||
|
||||
if (!(data_length % logical_block_size() == 0)) {
|
||||
if (!(data_length % device_block_size() == 0)) {
|
||||
dbgln_if(ISO9660_DEBUG, "Found a directory with non-logical block size aligned data length!");
|
||||
return EIO;
|
||||
}
|
||||
|
||||
auto blocks = TRY(KBuffer::try_create_with_size("ISO9660FS: Directory traversal buffer"sv, data_length, Memory::Region::Access::Read | Memory::Region::Access::Write));
|
||||
auto blocks_buffer = UserOrKernelBuffer::for_kernel_buffer(blocks->data());
|
||||
TRY(raw_read_blocks(BlockBasedFileSystem::BlockIndex { extent_location }, data_length / logical_block_size(), blocks_buffer));
|
||||
TRY(raw_read_blocks(BlockBasedFileSystem::BlockIndex { extent_location }, data_length / device_block_size(), blocks_buffer));
|
||||
auto entry = TRY(ISO9660FSDirectoryEntry::try_create(extent_location, data_length, move(blocks)));
|
||||
m_directory_entry_cache.set(key, entry);
|
||||
|
||||
|
|
|
@ -20,17 +20,17 @@ ErrorOr<size_t> ISO9660Inode::read_bytes_locked(off_t offset, size_t size, UserO
|
|||
if (static_cast<u64>(offset) >= data_length)
|
||||
return 0;
|
||||
|
||||
auto block = TRY(KBuffer::try_create_with_size("ISO9660FS: Inode read buffer"sv, fs().m_logical_block_size));
|
||||
auto block = TRY(KBuffer::try_create_with_size("ISO9660FS: Inode read buffer"sv, fs().device_block_size()));
|
||||
auto block_buffer = UserOrKernelBuffer::for_kernel_buffer(block->data());
|
||||
|
||||
size_t total_bytes = min(size, data_length - offset);
|
||||
size_t nread = 0;
|
||||
size_t blocks_already_read = offset / fs().m_logical_block_size;
|
||||
size_t initial_offset = offset % fs().m_logical_block_size;
|
||||
size_t blocks_already_read = offset / fs().device_block_size();
|
||||
size_t initial_offset = offset % fs().device_block_size();
|
||||
|
||||
auto current_block_index = BlockBasedFileSystem::BlockIndex { extent_location + blocks_already_read };
|
||||
while (nread != total_bytes) {
|
||||
size_t bytes_to_read = min(total_bytes - nread, fs().logical_block_size() - initial_offset);
|
||||
size_t bytes_to_read = min(total_bytes - nread, fs().device_block_size() - initial_offset);
|
||||
auto buffer_offset = buffer.offset(nread);
|
||||
dbgln_if(ISO9660_VERY_DEBUG, "ISO9660Inode::read_bytes: Reading {} bytes into buffer offset {}/{}, logical block index: {}", bytes_to_read, nread, total_bytes, current_block_index.value());
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue