mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-28 23:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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
Notes: sideshowbarker 2024-07-19 07:58:15 +09:00
10 changed files with 90 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -28,7 +28,7 @@
#include <AK/StringBuilder.h>
#include <Kernel/Devices/BlockDevice.h>
#include <Kernel/FileSystem/Custody.h>
#include <Kernel/FileSystem/FileBackedFileSystem.h>
#include <Kernel/FileSystem/DiskBackedFileSystem.h>
#include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/FileSystem/FileSystem.h>
#include <Kernel/FileSystem/VirtualFileSystem.h>
@ -126,7 +126,14 @@ bool VFS::mount_root(FS& file_system)
}
m_root_inode = move(root_inode);
klog() << "VFS: mounted root from " << m_root_inode->fs().class_name() << " (" << static_cast<FileBackedFS&>(m_root_inode->fs()).file_description().absolute_path() << ")";
char device_name[32];
if (m_root_inode->fs().is_disk_backed()) {
auto& device = static_cast<DiskBackedFS&>(m_root_inode->fs()).device();
sprintf(device_name, "%d,%d", device.major(), device.minor());
} else {
sprintf(device_name, "not-a-disk");
}
klog() << "VFS: mounted root on " << m_root_inode->fs().class_name() << " (" << device_name << ")";
m_mounts.append(move(mount));
return true;