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

Kernel: Include absolute paths of mount points in /proc/mounts

Browse source
This commit is contained in:
Andreas Kling 2019-01-31 06:13:55 +01:00
parent 34e745b0b4
commit fc0b63ca3c
4 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Ext2FileSystem.cpp
View file

@ -124,7 +124,7 @@ bool Ext2FS::initialize()
const char* Ext2FS::class_name() const const char* Ext2FS::class_name() const
{ {
return "ext2fs"; return "Ext2FS";
} }
InodeIdentifier Ext2FS::root_inode() const InodeIdentifier Ext2FS::root_inode() const

15
Kernel/ProcFileSystem.cpp
View file

@ -208,15 +208,20 @@ ByteBuffer procfs$dmesg(SynthFSInode&)
ByteBuffer procfs$mounts(SynthFSInode&) ByteBuffer procfs$mounts(SynthFSInode&)
{ {
InterruptDisabler disabler; // FIXME: This is obviously racy against the VFS mounts changing.
StringBuilder builder; StringBuilder builder;
VFS::the().for_each_mount([&builder] (auto& mount) { VFS::the().for_each_mount([&builder] (auto& mount) {
auto& fs = mount.guest_fs(); auto& fs = mount.guest_fs();
builder.appendf("%s @ ", fs.class_name()); builder.appendf("%s @ ", fs.class_name());
if (!mount.host().is_valid()) if (!mount.host().is_valid())
builder.appendf("/\n", fs.class_name()); builder.appendf("/");
else else {
builder.appendf("%u:%u\n", mount.host().fsid(), mount.host().index()); builder.appendf("%u:%u", mount.host().fsid(), mount.host().index());
auto path = VFS::the().absolute_path(mount.host());
builder.append(' ');
builder.append(path);
}
builder.append('\n');
}); });
return builder.to_byte_buffer(); return builder.to_byte_buffer();
} }
@ -401,5 +406,5 @@ bool ProcFS::initialize()
const char* ProcFS::class_name() const const char* ProcFS::class_name() const
{ {
return "procfs"; return "ProcFS";
} }

8
Kernel/VirtualFileSystem.cpp
View file

@ -371,6 +371,14 @@ RetainPtr<Inode> VFS::get_inode(InodeIdentifier inode_id)
return inode_id.fs()->get_inode(inode_id); return inode_id.fs()->get_inode(inode_id);
} }
String VFS::absolute_path(InodeIdentifier inode_id)
{
auto inode = get_inode(inode_id);
if (!inode)
return { };
return absolute_path(*inode);
}
String VFS::absolute_path(Inode& core_inode) String VFS::absolute_path(Inode& core_inode)
{ {
int error; int error;

1
Kernel/VirtualFileSystem.h
View file

@ -79,6 +79,7 @@ public:
void for_each_mount(Function<void(const Mount&)>) const; void for_each_mount(Function<void(const Mount&)>) const;
String absolute_path(Inode&); String absolute_path(Inode&);
String absolute_path(InodeIdentifier);
InodeIdentifier root_inode_id() const; InodeIdentifier root_inode_id() const;
Inode* root_inode() { return m_root_inode.ptr(); } Inode* root_inode() { return m_root_inode.ptr(); }