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

Kernel: Make Inode::set_shared_vmobject() OOM-fallible

Browse source 
Allocating a WeakPtr can fail, so this let's us properly propagate said
failure.
This commit is contained in:
Idan Horowitz 2022-02-14 01:46:34 +02:00 • committed by Andreas Kling
parent c620f18d8c
commit e37e4a7980
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/FileSystem/Inode.cpp
View file

@ -130,10 +130,11 @@ ErrorOr<void> Inode::decrement_link_count()
return ENOTIMPL; return ENOTIMPL;
} }
void Inode::set_shared_vmobject(Memory::SharedInodeVMObject& vmobject) ErrorOr<void> Inode::set_shared_vmobject(Memory::SharedInodeVMObject& vmobject)
{ {
MutexLocker locker(m_inode_lock); MutexLocker locker(m_inode_lock);
m_shared_vmobject = vmobject; m_shared_vmobject = TRY(vmobject.try_make_weak_ptr<Memory::SharedInodeVMObject>());
return {};
} }
RefPtr<LocalSocket> Inode::bound_socket() const RefPtr<LocalSocket> Inode::bound_socket() const

2
Kernel/FileSystem/Inode.h
View file

@ -82,7 +82,7 @@ public:
void will_be_destroyed(); void will_be_destroyed();
void set_shared_vmobject(Memory::SharedInodeVMObject&); ErrorOr<void> set_shared_vmobject(Memory::SharedInodeVMObject&);
RefPtr<Memory::SharedInodeVMObject> shared_vmobject() const; RefPtr<Memory::SharedInodeVMObject> shared_vmobject() const;
static void sync_all(); static void sync_all();

2
Kernel/Memory/SharedInodeVMObject.cpp
View file

@ -18,7 +18,7 @@ ErrorOr<NonnullRefPtr<SharedInodeVMObject>> SharedInodeVMObject::try_create_with
auto new_physical_pages = TRY(VMObject::try_create_physical_pages(size)); auto new_physical_pages = TRY(VMObject::try_create_physical_pages(size));
auto dirty_pages = TRY(Bitmap::try_create(new_physical_pages.size(), false)); auto dirty_pages = TRY(Bitmap::try_create(new_physical_pages.size(), false));
auto vmobject = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) SharedInodeVMObject(inode, move(new_physical_pages), move(dirty_pages)))); auto vmobject = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) SharedInodeVMObject(inode, move(new_physical_pages), move(dirty_pages))));
vmobject->inode().set_shared_vmobject(*vmobject); TRY(vmobject->inode().set_shared_vmobject(*vmobject));
return vmobject; return vmobject;
} }