RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:38:11 +00:00
Code Issues Activity Actions

Kernel: Make Inode::directory_entry_count errors observable.

Browse source 
Certain implementations of Inode::directory_entry_count were calling
functions which returned errors, but had no way of surfacing them.
Switch the return type to KResultOr<size_t> and start observing these
error paths.
This commit is contained in:
Brian Gianforcaro 2020-08-05 01:00:18 -07:00 • committed by Andreas Kling
parent 7490ea9449
commit e8c9b5e870
12 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/FileSystem/ProcFS.cpp
View file

@ -1515,10 +1515,10 @@ RefPtr<Inode> ProcFSProxyInode::lookup(StringView name)
return m_fd->inode()->lookup(name);
}
size_t ProcFSProxyInode::directory_entry_count() const
KResultOr<size_t> ProcFSProxyInode::directory_entry_count() const
{
if (!m_fd->inode())
return 0;
return KResult(-EINVAL);
return m_fd->inode()->directory_entry_count();
}
@ -1538,14 +1538,18 @@ KResult ProcFSInode::remove_child(const StringView& name)
return KResult(-EPERM);
}
size_t ProcFSInode::directory_entry_count() const
KResultOr<size_t> ProcFSInode::directory_entry_count() const
{
ASSERT(is_directory());
size_t count = 0;
traverse_as_directory([&count](const FS::DirectoryEntry&) {
KResult result = traverse_as_directory([&count](const FS::DirectoryEntry&) {
++count;
return true;
});
if (result.is_error())
return result;
return count;
}