RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 17:28:10 +00:00
Code Issues Activity Actions

Kernel: Make DiskCache::ensure OOM-fallible using ErrorOr

Browse source
This commit is contained in:
Idan Horowitz 2022-01-23 17:35:28 +02:00
parent b509d8a2f7
commit f39e9b19c6
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Kernel/FileSystem/BlockBasedFileSystem.cpp
View file

@ -63,10 +63,10 @@ public:
return &entry; return &entry;
} }
CacheEntry& ensure(BlockBasedFileSystem::BlockIndex block_index) const ErrorOr<CacheEntry*> ensure(BlockBasedFileSystem::BlockIndex block_index) const
{ {
if (auto* entry = get(block_index)) if (auto* entry = get(block_index))
return *entry; return entry;
if (m_clean_list.is_empty()) { if (m_clean_list.is_empty()) {
// Not a single clean entry! Flush writes and try again. // Not a single clean entry! Flush writes and try again.
@ -81,12 +81,12 @@ public:
m_clean_list.prepend(new_entry); m_clean_list.prepend(new_entry);
m_hash.remove(new_entry.block_index); m_hash.remove(new_entry.block_index);
m_hash.set(block_index, &new_entry); TRY(m_hash.try_set(block_index, &new_entry));
new_entry.block_index = block_index; new_entry.block_index = block_index;
new_entry.has_data = false; new_entry.has_data = false;
return new_entry; return &new_entry;
} }
const CacheEntry* entries() const { return (const CacheEntry*)m_entries->data(); } const CacheEntry* entries() const { return (const CacheEntry*)m_entries->data(); }
@ -156,15 +156,15 @@ ErrorOr<void> BlockBasedFileSystem::write_block(BlockIndex index, const UserOrKe
return {}; return {};
} }
auto& entry = cache->ensure(index); auto entry = TRY(cache->ensure(index));
if (count < block_size()) { if (count < block_size()) {
// Fill the cache first. // Fill the cache first.
TRY(read_block(index, nullptr, block_size())); TRY(read_block(index, nullptr, block_size()));
} }
memcpy(entry.data + offset, buffered_data.data(), count); memcpy(entry->data + offset, buffered_data.data(), count);
cache->mark_dirty(entry); cache->mark_dirty(*entry);
entry.has_data = true; entry->has_data = true;
return {}; return {};
}); });
} }
@ -230,16 +230,16 @@ ErrorOr<void> BlockBasedFileSystem::read_block(BlockIndex index, UserOrKernelBuf
return {}; return {};
} }
auto& entry = cache->ensure(index); auto* entry = TRY(cache->ensure(index));
if (!entry.has_data) { if (!entry->has_data) {
auto base_offset = index.value() * block_size(); auto base_offset = index.value() * block_size();
auto entry_data_buffer = UserOrKernelBuffer::for_kernel_buffer(entry.data); auto entry_data_buffer = UserOrKernelBuffer::for_kernel_buffer(entry->data);
auto nread = TRY(file_description().read(entry_data_buffer, base_offset, block_size())); auto nread = TRY(file_description().read(entry_data_buffer, base_offset, block_size()));
VERIFY(nread == block_size()); VERIFY(nread == block_size());
entry.has_data = true; entry->has_data = true;
} }
if (buffer) if (buffer)
TRY(buffer->write(entry.data + offset, count)); TRY(buffer->write(entry->data + offset, count));
return {}; return {};
}); });
} }