mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

Kernel: Move ProcFS API towards OOM safety

Browse source
This commit is contained in:
Brian Gianforcaro 2021-05-28 05:41:31 -07:00 • committed by Linus Groh
parent 23c021912e
commit cbe1e05771
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Kernel/FileSystem/ProcFS.cpp
View file

@ -234,9 +234,9 @@ struct ProcFSInodeData : public FileDescriptionData {
RefPtr<KBufferImpl> buffer; RefPtr<KBufferImpl> buffer;
}; };
NonnullRefPtr<ProcFS> ProcFS::create() RefPtr<ProcFS> ProcFS::create()
{ {
return adopt_ref(*new ProcFS); return adopt_ref_if_nonnull(new ProcFS);
} }
ProcFS::~ProcFS() ProcFS::~ProcFS()
@ -1015,10 +1015,12 @@ RefPtr<Inode> ProcFS::get_inode(InodeIdentifier inode_id) const
// and if that fails we cannot return this instance anymore and just // and if that fails we cannot return this instance anymore and just
// create a new one. // create a new one.
if (it->value->try_ref()) if (it->value->try_ref())
return adopt_ref(*it->value); return adopt_ref_if_nonnull(it->value);
// We couldn't ref it, so just create a new one and replace the entry // We couldn't ref it, so just create a new one and replace the entry
} }
auto inode = adopt_ref(*new ProcFSInode(const_cast<ProcFS&>(*this), inode_id.index())); auto inode = adopt_ref_if_nonnull(new ProcFSInode(const_cast<ProcFS&>(*this), inode_id.index()));
if (!inode)
return {};
auto result = m_inodes.set(inode_id.index().value(), inode.ptr()); auto result = m_inodes.set(inode_id.index().value(), inode.ptr());
VERIFY(result == ((it == m_inodes.end()) ? AK::HashSetResult::InsertedNewEntry : AK::HashSetResult::ReplacedExistingEntry)); VERIFY(result == ((it == m_inodes.end()) ? AK::HashSetResult::InsertedNewEntry : AK::HashSetResult::ReplacedExistingEntry));
return inode; return inode;

2
Kernel/FileSystem/ProcFS.h
View file

@ -24,7 +24,7 @@ class ProcFS final : public FS {
public: public:
virtual ~ProcFS() override; virtual ~ProcFS() override;
static NonnullRefPtr<ProcFS> create(); static RefPtr<ProcFS> create();
virtual bool initialize() override; virtual bool initialize() override;
virtual const char* class_name() const override; virtual const char* class_name() const override;