From db35d599948342965b66be8209770bc6dc6b45a3 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 23 Jan 2019 05:42:23 +0100 Subject: [PATCH] VFS: Move Ext2FSInode::m_lock up to Inode so all inodes can have locking. --- Kernel/Ext2FileSystem.h | 2 -- Kernel/FileSystem.h | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Kernel/Ext2FileSystem.h b/Kernel/Ext2FileSystem.h index ce2344ab82..eea6b17608 100644 --- a/Kernel/Ext2FileSystem.h +++ b/Kernel/Ext2FileSystem.h @@ -4,7 +4,6 @@ #include "UnixTypes.h" #include #include -#include #include "ext2_fs.h" struct ext2_group_desc; @@ -48,7 +47,6 @@ private: const Ext2FS& fs() const; Ext2FSInode(Ext2FS&, unsigned index, const ext2_inode&); - Lock m_lock; Vector m_block_list; HashMap m_lookup_cache; ext2_inode m_raw_inode; diff --git a/Kernel/FileSystem.h b/Kernel/FileSystem.h index 789117d252..e58d4dd135 100644 --- a/Kernel/FileSystem.h +++ b/Kernel/FileSystem.h @@ -13,6 +13,7 @@ #include #include #include +#include static const dword mepoch = 476763780; @@ -106,8 +107,10 @@ public: protected: Inode(FS& fs, unsigned index); - void set_metadata_dirty(bool b) { m_metadata_dirty = b; } + + Lock m_lock; + private: FS& m_fs; unsigned m_index { 0 };