RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 00:47:36 +00:00
Code Issues Activity Actions

Kernel: Expose info about source devices of mounts in /proc/df

Browse source
This commit is contained in:
Sergey Bugaev 2019-08-17 12:17:36 +03:00 • committed by Andreas Kling
parent 425c356288
commit fde8f7f538
5 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Kernel/Devices/Device.cpp
View file

@ -14,7 +14,12 @@ Device::~Device()
VFS::the().unregister_device({}, *this); VFS::the().unregister_device({}, *this);
} }
String Device::absolute_path(const FileDescription&) const String Device::absolute_path() const
{ {
return String::format("device:%u,%u (%s)", m_major, m_minor, class_name()); return String::format("device:%u,%u (%s)", m_major, m_minor, class_name());
} }
String Device::absolute_path(const FileDescription&) const
{
return absolute_path();
}

1
Kernel/Devices/Device.h
View file

@ -20,6 +20,7 @@ public:
unsigned minor() const { return m_minor; } unsigned minor() const { return m_minor; }
virtual String absolute_path(const FileDescription&) const override; virtual String absolute_path(const FileDescription&) const override;
virtual String absolute_path() const;
uid_t uid() const { return m_uid; } uid_t uid() const { return m_uid; }
uid_t gid() const { return m_gid; } uid_t gid() const { return m_gid; }

2
Kernel/FileSystem/DiskBackedFileSystem.h
View file

@ -7,6 +7,8 @@ class DiskBackedFS : public FS {
public: public:
virtual ~DiskBackedFS() override; virtual ~DiskBackedFS() override;
virtual bool is_disk_backed() const override { return true; }
DiskDevice& device() { return *m_device; } DiskDevice& device() { return *m_device; }
const DiskDevice& device() const { return *m_device; } const DiskDevice& device() const { return *m_device; }

2
Kernel/FileSystem/FileSystem.h
View file

@ -65,6 +65,8 @@ public:
int block_size() const { return m_block_size; } int block_size() const { return m_block_size; }
virtual bool is_disk_backed() const { return false; }
protected: protected:
FS(); FS();

9
Kernel/FileSystem/ProcFS.cpp
View file

@ -9,6 +9,7 @@
#include <AK/JsonValue.h> #include <AK/JsonValue.h>
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/FileSystem/Custody.h> #include <Kernel/FileSystem/Custody.h>
#include <Kernel/FileSystem/DiskBackedFileSystem.h>
#include <Kernel/FileSystem/FileDescription.h> #include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/FileSystem/VirtualFileSystem.h> #include <Kernel/FileSystem/VirtualFileSystem.h>
#include <Kernel/KBufferBuilder.h> #include <Kernel/KBufferBuilder.h>
@ -502,7 +503,13 @@ Optional<KBuffer> procfs$df(InodeIdentifier)
fs_object.set("mount_point", mount.absolute_path()); fs_object.set("mount_point", mount.absolute_path());
fs_object.set("block_size", fs.block_size()); fs_object.set("block_size", fs.block_size());
fs_object.set("readonly", fs.is_readonly()); fs_object.set("readonly", fs.is_readonly());
json.append(fs_object);
if (fs.is_disk_backed())
fs_object.set("device", static_cast<const DiskBackedFS&>(fs).device().absolute_path());
else
fs_object.set("device", nullptr);
json.append(move(fs_object));
}); });
return json.serialized<KBufferBuilder>(); return json.serialized<KBufferBuilder>();
} }