RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:57:45 +00:00
Code Issues Activity Actions

Kernel: Wrap ISO9660FS directory traversal in TRY()

Browse source
This commit is contained in:
Andreas Kling 2021-09-06 20:28:40 +02:00
parent a2bf8244fe
commit 1101994fad
1 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Kernel/FileSystem/ISO9660FileSystem.cpp
View file

@ -305,7 +305,7 @@ KResult ISO9660FS::calculate_inode_count() const
size_t inode_count = 1; size_t inode_count = 1;
auto traversal_result = visit_directory_record(m_primary_volume->root_directory_record_header, [&](ISO::DirectoryRecordHeader const* header) { TRY(visit_directory_record(m_primary_volume->root_directory_record_header, [&](ISO::DirectoryRecordHeader const* header) {
if (header == nullptr) { if (header == nullptr) {
return RecursionDecision::Continue; return RecursionDecision::Continue;
} }
@ -324,12 +324,7 @@ KResult ISO9660FS::calculate_inode_count() const
} }
return RecursionDecision::Continue; return RecursionDecision::Continue;
}); }));
if (traversal_result.is_error()) {
dbgln_if(ISO9660_DEBUG, "Failed to traverse for caching inode count!");
return traversal_result;
}
m_cached_inode_count = inode_count; m_cached_inode_count = inode_count;
return KSuccess; return KSuccess;
@ -473,7 +468,7 @@ KResult ISO9660Inode::traverse_as_directory(Function<bool(FileSystem::DirectoryE
{ {
Array<u8, max_file_identifier_length> file_identifier_buffer; Array<u8, max_file_identifier_length> file_identifier_buffer;
auto traversal_result = fs().visit_directory_record(m_record, [&](ISO::DirectoryRecordHeader const* record) { return fs().visit_directory_record(m_record, [&](ISO::DirectoryRecordHeader const* record) {
StringView filename = get_normalized_filename(*record, file_identifier_buffer); StringView filename = get_normalized_filename(*record, file_identifier_buffer);
dbgln_if(ISO9660_VERY_DEBUG, "traverse_as_directory(): Found {}", filename); dbgln_if(ISO9660_VERY_DEBUG, "traverse_as_directory(): Found {}", filename);
@ -486,11 +481,6 @@ KResult ISO9660Inode::traverse_as_directory(Function<bool(FileSystem::DirectoryE
return RecursionDecision::Continue; return RecursionDecision::Continue;
}); });
if (traversal_result.is_error())
return traversal_result;
return KSuccess;
} }
KResultOr<NonnullRefPtr<Inode>> ISO9660Inode::lookup(StringView name) KResultOr<NonnullRefPtr<Inode>> ISO9660Inode::lookup(StringView name)
@ -498,7 +488,7 @@ KResultOr<NonnullRefPtr<Inode>> ISO9660Inode::lookup(StringView name)
RefPtr<Inode> inode; RefPtr<Inode> inode;
Array<u8, max_file_identifier_length> file_identifier_buffer; Array<u8, max_file_identifier_length> file_identifier_buffer;
auto traversal_result = fs().visit_directory_record(m_record, [&](ISO::DirectoryRecordHeader const* record) { TRY(fs().visit_directory_record(m_record, [&](ISO::DirectoryRecordHeader const* record) {
StringView filename = get_normalized_filename(*record, file_identifier_buffer); StringView filename = get_normalized_filename(*record, file_identifier_buffer);
if (filename == name) { if (filename == name) {
@ -516,10 +506,7 @@ KResultOr<NonnullRefPtr<Inode>> ISO9660Inode::lookup(StringView name)
} }
return RecursionDecision::Continue; return RecursionDecision::Continue;
}); }));
if (traversal_result.is_error())
return traversal_result;
if (!inode) if (!inode)
return ENOENT; return ENOENT;