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

Kernel: Remove friend classes from ProcFSComponentsRegistrar

Browse source
This commit is contained in:
Andreas Kling 2021-07-11 01:39:51 +02:00
parent 358a7cc448
commit c1143e1bae
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/GlobalProcessExposed.cpp
View file

@ -867,7 +867,7 @@ UNMAP_AFTER_INIT NonnullRefPtr<ProcFSRootDirectory> ProcFSRootDirectory::must_cr
KResult ProcFSRootDirectory::traverse_as_directory(unsigned fsid, Function<bool(FileSystem::DirectoryEntryView const&)> callback) const KResult ProcFSRootDirectory::traverse_as_directory(unsigned fsid, Function<bool(FileSystem::DirectoryEntryView const&)> callback) const
{ {
Locker locker(ProcFSComponentsRegistrar::the().m_lock); Locker locker(ProcFSComponentsRegistrar::the().get_lock());
callback({ ".", { fsid, component_index() }, 0 }); callback({ ".", { fsid, component_index() }, 0 });
callback({ "..", { fsid, 0 }, 0 }); callback({ "..", { fsid, 0 }, 0 });

2
Kernel/ProcessExposed.cpp
View file

@ -242,7 +242,7 @@ RefPtr<ProcFSExposedComponent> ProcFSExposedDirectory::lookup(StringView name)
KResult ProcFSExposedDirectory::traverse_as_directory(unsigned fsid, Function<bool(FileSystem::DirectoryEntryView const&)> callback) const KResult ProcFSExposedDirectory::traverse_as_directory(unsigned fsid, Function<bool(FileSystem::DirectoryEntryView const&)> callback) const
{ {
Locker locker(ProcFSComponentsRegistrar::the().m_lock); Locker locker(ProcFSComponentsRegistrar::the().get_lock());
auto parent_folder = m_parent_folder.strong_ref(); auto parent_folder = m_parent_folder.strong_ref();
if (parent_folder.is_null()) if (parent_folder.is_null())
return KResult(EINVAL); return KResult(EINVAL);

6
Kernel/ProcessExposed.h
View file

@ -29,11 +29,6 @@ class ProcFSBusDirectory;
class ProcFSSystemBoolean; class ProcFSSystemBoolean;
class ProcFSComponentsRegistrar { class ProcFSComponentsRegistrar {
friend class ProcFS;
friend class ProcFSExposedComponent;
friend class ProcFSExposedDirectory;
friend class ProcFSRootDirectory;
public: public:
static ProcFSComponentsRegistrar& the(); static ProcFSComponentsRegistrar& the();
@ -50,6 +45,7 @@ public:
void unregister_process(Process&); void unregister_process(Process&);
ProcFSRootDirectory& root_folder() { return *m_root_folder; } ProcFSRootDirectory& root_folder() { return *m_root_folder; }
Lock& get_lock() { return m_lock; }
private: private:
Lock m_lock; Lock m_lock;