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

Kernel: Remove use of copy_ref() in favor of regular RefPtr copies.

Browse source 
This is obviously more readable. If we ever run into a situation where
ref count churn is actually causing trouble in the future, we can deal with
it then. For now, let's keep it simple. :^)
This commit is contained in:
Andreas Kling 2019-07-11 15:38:47 +02:00
parent 560d037c41
commit 5254a320d8
14 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -31,7 +31,7 @@ static u8 to_ext2_file_type(mode_t mode)
return EXT2_FT_UNKNOWN;
}
NonnullRefPtr<Ext2FS> Ext2FS::create(NonnullRefPtr<DiskDevice>&& device)
NonnullRefPtr<Ext2FS> Ext2FS::create(NonnullRefPtr<DiskDevice> device)
{
return adopt(*new Ext2FS(move(device)));
}
@ -475,7 +475,7 @@ RefPtr<Inode> Ext2FS::get_inode(InodeIdentifier inode) const
return (*it).value;
auto new_inode = adopt(*new Ext2FSInode(const_cast<Ext2FS&>(*this), inode.index()));
memcpy(&new_inode->m_raw_inode, reinterpret_cast<ext2_inode*>(block.offset_pointer(offset)), sizeof(ext2_inode));
m_inode_cache.set(inode.index(), new_inode.copy_ref());
m_inode_cache.set(inode.index(), new_inode);
return new_inode;
}

2
Kernel/FileSystem/Ext2FileSystem.h
View file

@ -60,7 +60,7 @@ class Ext2FS final : public DiskBackedFS {
friend class Ext2FSInode;
public:
static NonnullRefPtr<Ext2FS> create(NonnullRefPtr<DiskDevice>&&);
static NonnullRefPtr<Ext2FS> create(NonnullRefPtr<DiskDevice>);
virtual ~Ext2FS() override;
virtual bool initialize() override;

8
Kernel/FileSystem/FileDescription.cpp
View file

@ -22,7 +22,7 @@ NonnullRefPtr<FileDescription> FileDescription::create(RefPtr<Custody>&& custody
return description;
}
NonnullRefPtr<FileDescription> FileDescription::create(RefPtr<File>&& file, SocketRole role)
NonnullRefPtr<FileDescription> FileDescription::create(RefPtr<File> file, SocketRole role)
{
return adopt(*new FileDescription(move(file), role));
}
@ -64,9 +64,9 @@ NonnullRefPtr<FileDescription> FileDescription::clone()
if (is_fifo()) {
description = fifo()->open_direction(m_fifo_direction);
} else {
description = FileDescription::create(m_file.copy_ref(), m_socket_role);
description->m_custody = m_custody.copy_ref();
description->m_inode = m_inode.copy_ref();
description = FileDescription::create(m_file, m_socket_role);
description->m_custody = m_custody;
description->m_inode = m_inode;
}
ASSERT(description);
description->m_current_offset = m_current_offset;

2
Kernel/FileSystem/FileDescription.h
View file

@ -22,7 +22,7 @@ class SharedMemory;
class FileDescription : public RefCounted<FileDescription> {
public:
static NonnullRefPtr<FileDescription> create(RefPtr<Custody>&&);
static NonnullRefPtr<FileDescription> create(RefPtr<File>&&, SocketRole = SocketRole::None);
static NonnullRefPtr<FileDescription> create(RefPtr<File>, SocketRole = SocketRole::None);
~FileDescription();
NonnullRefPtr<FileDescription> clone();