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

Kernel: Tidy up DevFS construction and handle OOM errorso

Browse source 
- Use KResultOr and TRY() to propagate errors
- Check for OOM
- Move allocations out of the DevFS constructor
This commit is contained in:
Andreas Kling 2021-09-06 10:47:47 +02:00
parent efe4e230ee
commit 788b91a65c
3 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Kernel/FileSystem/DevFS.cpp
View file

@ -10,21 +10,13 @@
namespace Kernel { namespace Kernel {
NonnullRefPtr<DevFS> DevFS::create() KResultOr<NonnullRefPtr<DevFS>> DevFS::try_create()
{ {
return adopt_ref(*new DevFS); return adopt_nonnull_ref_or_enomem(new (nothrow) DevFS);
} }
DevFS::DevFS() DevFS::DevFS()
: m_root_inode(adopt_ref(*new DevFSRootDirectoryInode(*this)))
{ {
MutexLocker locker(m_lock);
Device::for_each([&](Device& device) {
// FIXME: Find a better way to not add MasterPTYs or SlavePTYs!
if (device.is_master_pty() || (device.is_character_device() && device.major() == 201))
return;
notify_new_device(device);
});
} }
void DevFS::notify_new_device(Device& device) void DevFS::notify_new_device(Device& device)
@ -57,6 +49,13 @@ DevFS::~DevFS()
KResult DevFS::initialize() KResult DevFS::initialize()
{ {
m_root_inode = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) DevFSRootDirectoryInode(*this)));
Device::for_each([&](Device& device) {
// FIXME: Find a better way to not add MasterPTYs or SlavePTYs!
if (device.is_master_pty() || (device.is_character_device() && device.major() == 201))
return;
notify_new_device(device);
});
return KSuccess; return KSuccess;
} }
@ -69,7 +68,7 @@ KResultOr<NonnullRefPtr<Inode>> DevFS::get_inode(InodeIdentifier inode_id) const
{ {
MutexLocker locker(m_lock); MutexLocker locker(m_lock);
if (inode_id.index() == 1) if (inode_id.index() == 1)
return m_root_inode; return *m_root_inode;
for (auto& node : m_nodes) { for (auto& node : m_nodes) {
if (inode_id.index() == node.index()) if (inode_id.index() == node.index())
return node; return node;
@ -263,9 +262,7 @@ KResultOr<NonnullRefPtr<Inode>> DevFSRootDirectoryInode::create_child(StringView
} }
if (name != "pts") if (name != "pts")
return EROFS; return EROFS;
auto new_directory_inode = adopt_ref_if_nonnull(new (nothrow) DevFSPtsDirectoryInode(fs())); auto new_directory_inode = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) DevFSPtsDirectoryInode(fs())));
if (!new_directory_inode)
return ENOMEM;
if (!m_subdirectories.try_ensure_capacity(m_subdirectories.size() + 1)) if (!m_subdirectories.try_ensure_capacity(m_subdirectories.size() + 1))
return ENOMEM; return ENOMEM;
if (!fs().m_nodes.try_ensure_capacity(fs().m_nodes.size() + 1)) if (!fs().m_nodes.try_ensure_capacity(fs().m_nodes.size() + 1))
@ -282,16 +279,14 @@ KResultOr<NonnullRefPtr<Inode>> DevFSRootDirectoryInode::create_child(StringView
auto name_kstring = KString::try_create(name); auto name_kstring = KString::try_create(name);
if (!name_kstring) if (!name_kstring)
return ENOMEM; return ENOMEM;
auto new_link_inode = adopt_ref_if_nonnull(new (nothrow) DevFSLinkInode(fs(), name_kstring.release_nonnull())); auto new_link_inode = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) DevFSLinkInode(fs(), name_kstring.release_nonnull())));
if (!new_link_inode)
return ENOMEM;
if (!m_links.try_ensure_capacity(m_links.size() + 1)) if (!m_links.try_ensure_capacity(m_links.size() + 1))
return ENOMEM; return ENOMEM;
if (!fs().m_nodes.try_ensure_capacity(fs().m_nodes.size() + 1)) if (!fs().m_nodes.try_ensure_capacity(fs().m_nodes.size() + 1))
return ENOMEM; return ENOMEM;
m_links.append(*new_link_inode); m_links.append(*new_link_inode);
fs().m_nodes.append(*new_link_inode); fs().m_nodes.append(*new_link_inode);
return new_link_inode.release_nonnull(); return new_link_inode;
} }
return EROFS; return EROFS;
} }

4
Kernel/FileSystem/DevFS.h
View file

@ -20,7 +20,7 @@ class DevFS final : public FileSystem {
public: public:
virtual ~DevFS() override; virtual ~DevFS() override;
static NonnullRefPtr<DevFS> create(); static KResultOr<NonnullRefPtr<DevFS>> try_create();
virtual KResult initialize() override; virtual KResult initialize() override;
virtual StringView class_name() const override { return "DevFS"sv; } virtual StringView class_name() const override { return "DevFS"sv; }
@ -35,7 +35,7 @@ private:
KResultOr<NonnullRefPtr<Inode>> get_inode(InodeIdentifier) const; KResultOr<NonnullRefPtr<Inode>> get_inode(InodeIdentifier) const;
size_t allocate_inode_index(); size_t allocate_inode_index();
NonnullRefPtr<DevFSRootDirectoryInode> m_root_inode; RefPtr<DevFSRootDirectoryInode> m_root_inode;
NonnullRefPtrVector<DevFSInode> m_nodes; NonnullRefPtrVector<DevFSInode> m_nodes;
InodeIndex m_next_inode_index { 0 }; InodeIndex m_next_inode_index { 0 };

2
Kernel/Syscalls/mount.cpp
View file

@ -83,7 +83,7 @@ KResultOr<FlatPtr> Process::sys$mount(Userspace<const Syscall::SC_mount_params*>
} else if (fs_type == "devpts"sv || fs_type == "DevPtsFS"sv) { } else if (fs_type == "devpts"sv || fs_type == "DevPtsFS"sv) {
fs = TRY(DevPtsFS::try_create()); fs = TRY(DevPtsFS::try_create());
} else if (fs_type == "dev"sv || fs_type == "DevFS"sv) { } else if (fs_type == "dev"sv || fs_type == "DevFS"sv) {
fs = DevFS::create(); fs = TRY(DevFS::try_create());
} else if (fs_type == "sys"sv || fs_type == "SysFS"sv) { } else if (fs_type == "sys"sv || fs_type == "SysFS"sv) {
fs = SysFS::create(); fs = SysFS::create();
} else if (fs_type == "tmp"sv || fs_type == "TmpFS"sv) { } else if (fs_type == "tmp"sv || fs_type == "TmpFS"sv) {