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

Revert "Kernel: Change Ext2FS to be backed by a file instead of a block device"

Browse source 
This reverts commit 6b59311d4b.

Reverting these changes since they broke things.
Fixes #1608.
This commit is contained in:
Andreas Kling 2020-04-03 21:20:51 +02:00
parent 9ae3cced76
commit c2a8bbcb59
10 changed files with 90 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/FileSystem/Ext2FileSystem.h
View file

@ -28,7 +28,7 @@
#include <AK/Bitmap.h>
#include <AK/HashMap.h>
#include <Kernel/FileSystem/FileBackedFileSystem.h>
#include <Kernel/FileSystem/DiskBackedFileSystem.h>
#include <Kernel/FileSystem/Inode.h>
#include <Kernel/FileSystem/ext2_fs.h>
#include <Kernel/KBuffer.h>
@ -88,12 +88,11 @@ private:
ext2_inode m_raw_inode;
};
class Ext2FS final : public FileBackedFS {
class Ext2FS final : public DiskBackedFS {
friend class Ext2FSInode;
public:
static NonnullRefPtr<Ext2FS> create(FileDescription&);
static NonnullRefPtr<Ext2FS> create(BlockDevice&);
virtual ~Ext2FS() override;
virtual bool initialize() override;
@ -110,7 +109,7 @@ private:
typedef unsigned BlockIndex;
typedef unsigned GroupIndex;
typedef unsigned InodeIndex;
explicit Ext2FS(FileDescription&);
explicit Ext2FS(BlockDevice&);
const ext2_super_block& super_block() const { return m_super_block; }
const ext2_group_desc& group_descriptor(GroupIndex) const;