From df5fa8aa3919f3f132509b236c3b3ac27ea113b1 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 18 Jul 2021 02:24:26 +0200 Subject: [PATCH] Kernel/ProcFS: Remove redundant ProcFS& member from ProcFSInode --- Kernel/FileSystem/ProcFS.cpp | 9 ++++----- Kernel/FileSystem/ProcFS.h | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp index 8aea1d979f..51f0c98b45 100644 --- a/Kernel/FileSystem/ProcFS.cpp +++ b/Kernel/FileSystem/ProcFS.cpp @@ -184,7 +184,6 @@ NonnullRefPtr ProcFSDirectoryInode::create(const ProcFS& p ProcFSDirectoryInode::ProcFSDirectoryInode(const ProcFS& fs, const ProcFSExposedComponent& component) : ProcFSInode(fs, component) - , m_parent_fs(const_cast(fs)) { } @@ -205,17 +204,17 @@ InodeMetadata ProcFSDirectoryInode::metadata() const } KResult ProcFSDirectoryInode::traverse_as_directory(Function callback) const { - MutexLocker locker(m_parent_fs.m_lock); - return m_associated_component->traverse_as_directory(m_parent_fs.fsid(), move(callback)); + MutexLocker locker(fs().m_lock); + return m_associated_component->traverse_as_directory(fs().fsid(), move(callback)); } RefPtr ProcFSDirectoryInode::lookup(StringView name) { - MutexLocker locker(m_parent_fs.m_lock); + MutexLocker locker(fs().m_lock); auto component = m_associated_component->lookup(name); if (!component) return {}; - return component->to_inode(m_parent_fs); + return component->to_inode(fs()); } NonnullRefPtr ProcFSLinkInode::create(const ProcFS& procfs, const ProcFSExposedComponent& component) diff --git a/Kernel/FileSystem/ProcFS.h b/Kernel/FileSystem/ProcFS.h index 51d08108e0..564646cbe3 100644 --- a/Kernel/FileSystem/ProcFS.h +++ b/Kernel/FileSystem/ProcFS.h @@ -84,14 +84,15 @@ public: static NonnullRefPtr create(const ProcFS&, const ProcFSExposedComponent&); virtual ~ProcFSDirectoryInode() override; + ProcFS& fs() { return static_cast(Inode::fs()); } + ProcFS const& fs() const { return static_cast(Inode::fs()); } + protected: ProcFSDirectoryInode(const ProcFS&, const ProcFSExposedComponent&); // ^Inode virtual InodeMetadata metadata() const override; virtual KResult traverse_as_directory(Function) const override; virtual RefPtr lookup(StringView name) override; - - ProcFS& m_parent_fs; }; }