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

Kernel: Remove all friend declarations from SysFSComponentRegistry

Browse source 
Let them access the class using public API instead.
This commit is contained in:
Andreas Kling 2021-07-11 01:17:33 +02:00
parent d40ea1a0a8
commit a9decf5aa6
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/FileSystem/ProcFS.cpp
View file

@ -115,7 +115,7 @@ ProcFSInode::~ProcFSInode()
} }
ProcFS::ProcFS() ProcFS::ProcFS()
: m_root_inode(ProcFSComponentsRegistrar::the().m_root_folder->to_inode(*this)) : m_root_inode(ProcFSComponentsRegistrar::the().root_folder().to_inode(*this))
{ {
} }

4
Kernel/FileSystem/SysFS.cpp
View file

@ -42,7 +42,7 @@ NonnullRefPtr<SysFSRootFolder> SysFSRootFolder::create()
KResult SysFSRootFolder::traverse_as_directory(unsigned fsid, Function<bool(FileSystem::DirectoryEntryView const&)> callback) const KResult SysFSRootFolder::traverse_as_directory(unsigned fsid, Function<bool(FileSystem::DirectoryEntryView const&)> callback) const
{ {
Locker locker(SysFSComponentRegistry::the().m_lock); Locker locker(SysFSComponentRegistry::the().get_lock());
callback({ ".", { fsid, component_index() }, 0 }); callback({ ".", { fsid, component_index() }, 0 });
callback({ "..", { fsid, 0 }, 0 }); callback({ "..", { fsid, 0 }, 0 });
@ -64,7 +64,7 @@ NonnullRefPtr<SysFS> SysFS::create()
} }
SysFS::SysFS() SysFS::SysFS()
: m_root_inode(SysFSComponentRegistry::the().m_root_folder->to_inode(*this)) : m_root_inode(SysFSComponentRegistry::the().root_folder().to_inode(*this))
{ {
Locker locker(m_lock); Locker locker(m_lock);
} }

8
Kernel/FileSystem/SysFS.h
View file

@ -24,11 +24,6 @@ private:
}; };
class SysFSComponentRegistry { class SysFSComponentRegistry {
friend class SysFS;
friend class SysFSComponent;
friend class SysFSDirectory;
friend class SysFSRootFolder;
public: public:
static SysFSComponentRegistry& the(); static SysFSComponentRegistry& the();
@ -37,7 +32,8 @@ public:
SysFSComponentRegistry(); SysFSComponentRegistry();
void register_new_component(SysFSComponent&); void register_new_component(SysFSComponent&);
NonnullRefPtr<SysFSDirectory> root_folder() { return m_root_folder; } SysFSDirectory& root_folder() { return m_root_folder; }
Lock& get_lock() { return m_lock; }
private: private:
Lock m_lock; Lock m_lock;

2
Kernel/FileSystem/SysFSComponent.cpp
View file

@ -28,7 +28,7 @@ SysFSComponent::SysFSComponent(StringView name)
KResult SysFSDirectory::traverse_as_directory(unsigned fsid, Function<bool(FileSystem::DirectoryEntryView const&)> callback) const KResult SysFSDirectory::traverse_as_directory(unsigned fsid, Function<bool(FileSystem::DirectoryEntryView const&)> callback) const
{ {
Locker locker(SysFSComponentRegistry::the().m_lock); Locker locker(SysFSComponentRegistry::the().get_lock());
VERIFY(m_parent_folder); VERIFY(m_parent_folder);
callback({ ".", { fsid, component_index() }, 0 }); callback({ ".", { fsid, component_index() }, 0 });
callback({ "..", { fsid, m_parent_folder->component_index() }, 0 }); callback({ "..", { fsid, m_parent_folder->component_index() }, 0 });