RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:58:11 +00:00
Code Issues Activity Actions

Kernel: Misc tweaks

Browse source
This commit is contained in:
Sergey Bugaev 2020-01-15 14:06:48 +03:00 • committed by Andreas Kling
parent 064cd2278c
commit 4417bd97d7
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -144,6 +144,7 @@ void VFS::traverse_directory_inode(Inode& dir_inode, Function<bool(const FS::Dir
else else
resolved_inode = entry.inode; resolved_inode = entry.inode;
// FIXME: This is now broken considering chroot and bind mounts.
if (dir_inode.identifier().is_root_inode() && !is_vfs_root(dir_inode.identifier()) && !strcmp(entry.name, "..")) { if (dir_inode.identifier().is_root_inode() && !is_vfs_root(dir_inode.identifier()) && !strcmp(entry.name, "..")) {
auto mount = find_mount_for_guest(entry.inode); auto mount = find_mount_for_guest(entry.inode);
ASSERT(mount); ASSERT(mount);

3
Kernel/init.cpp
View file

@ -29,10 +29,7 @@
#include <Kernel/Devices/SB16.h> #include <Kernel/Devices/SB16.h>
#include <Kernel/Devices/SerialDevice.h> #include <Kernel/Devices/SerialDevice.h>
#include <Kernel/Devices/ZeroDevice.h> #include <Kernel/Devices/ZeroDevice.h>
#include <Kernel/FileSystem/DevPtsFS.h>
#include <Kernel/FileSystem/Ext2FileSystem.h> #include <Kernel/FileSystem/Ext2FileSystem.h>
#include <Kernel/FileSystem/ProcFS.h>
#include <Kernel/FileSystem/TmpFS.h>
#include <Kernel/FileSystem/VirtualFileSystem.h> #include <Kernel/FileSystem/VirtualFileSystem.h>
#include <Kernel/Heap/SlabAllocator.h> #include <Kernel/Heap/SlabAllocator.h>
#include <Kernel/Heap/kmalloc.h> #include <Kernel/Heap/kmalloc.h>