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

ProcFS: Take the "all inodes" lock when generating /proc/inodes

Browse source 
Otherwise the kernel asserts.
This commit is contained in:
Andreas Kling 2020-11-23 16:19:30 +01:00
parent 086522537e
commit dfce9051fa
3 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/FileSystem/Inode.cpp
View file

@ -41,6 +41,11 @@ namespace Kernel {
static SpinLock s_all_inodes_lock; static SpinLock s_all_inodes_lock;
static AK::Singleton<InlineLinkedList<Inode>> s_list; static AK::Singleton<InlineLinkedList<Inode>> s_list;
SpinLock<u32>& Inode::all_inodes_lock()
{
return s_all_inodes_lock;
}
InlineLinkedList<Inode>& Inode::all_with_lock() InlineLinkedList<Inode>& Inode::all_with_lock()
{ {
ASSERT(s_all_inodes_lock.is_locked()); ASSERT(s_all_inodes_lock.is_locked());

2
Kernel/FileSystem/Inode.h
View file

@ -120,6 +120,8 @@ public:
Inode* m_next { nullptr }; Inode* m_next { nullptr };
Inode* m_prev { nullptr }; Inode* m_prev { nullptr };
static SpinLock<u32>& all_inodes_lock();
protected: protected:
Inode(FS& fs, unsigned index); Inode(FS& fs, unsigned index);
void set_metadata_dirty(bool); void set_metadata_dirty(bool);

1
Kernel/FileSystem/ProcFS.cpp
View file

@ -914,6 +914,7 @@ static Optional<KBuffer> procfs$inodes(InodeIdentifier)
{ {
KBufferBuilder builder; KBufferBuilder builder;
InterruptDisabler disabler; InterruptDisabler disabler;
ScopedSpinLock all_inodes_lock(Inode::all_inodes_lock());
for (auto& inode : Inode::all_with_lock()) { for (auto& inode : Inode::all_with_lock()) {
builder.appendf("Inode{K%x} %02u:%08u (%u)\n", &inode, inode.fsid(), inode.index(), inode.ref_count()); builder.appendf("Inode{K%x} %02u:%08u (%u)\n", &inode, inode.fsid(), inode.index(), inode.ref_count());
} }