From 843bd43c5be5b5d1b8bff8aa2a81b99ed232bc57 Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 6 Aug 2022 18:07:03 +0300 Subject: Kernel/FileSystem: Mark ext2 inode lookup cache non-const For the lookup cache, no method being declared const tried to modify it, so it was easy to drop the mutable declaration on the HashMap member. --- Kernel/FileSystem/Ext2FileSystem.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Kernel/FileSystem/Ext2FileSystem.cpp') diff --git a/Kernel/FileSystem/Ext2FileSystem.cpp b/Kernel/FileSystem/Ext2FileSystem.cpp index b2f90f85ac..48aa3b4cdd 100644 --- a/Kernel/FileSystem/Ext2FileSystem.cpp +++ b/Kernel/FileSystem/Ext2FileSystem.cpp @@ -1499,9 +1499,9 @@ ErrorOr> Ext2FS::create_inode(Ext2FSInode& parent_inode return new_inode; } -ErrorOr Ext2FSInode::populate_lookup_cache() const +ErrorOr Ext2FSInode::populate_lookup_cache() { - MutexLocker locker(m_inode_lock); + VERIFY(m_inode_lock.is_exclusively_locked_by_current_thread()); if (!m_lookup_cache.is_empty()) return {}; HashMap, InodeIndex> children; @@ -1521,11 +1521,11 @@ ErrorOr> Ext2FSInode::lookup(StringView name) { VERIFY(is_directory()); dbgln_if(EXT2_DEBUG, "Ext2FSInode[{}]:lookup(): Looking up '{}'", identifier(), name); - TRY(populate_lookup_cache()); InodeIndex inode_index; { MutexLocker locker(m_inode_lock); + TRY(populate_lookup_cache()); auto it = m_lookup_cache.find(name); if (it == m_lookup_cache.end()) { dbgln_if(EXT2_DEBUG, "Ext2FSInode[{}]:lookup(): '{}' not found", identifier(), name); -- cgit v1.2.3