RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:57:45 +00:00
Code Issues Activity Actions

Kernel: Use shared locking mode in some places

Browse source 
The notable piece of code that remains to be converted is Ext2FS.
This commit is contained in:
Sergey Bugaev 2020-04-18 12:50:35 +03:00 • committed by Andreas Kling
parent 05ba4295e9
commit 54550365eb
11 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/FileSystem/FileDescription.cpp
View file

@ -168,7 +168,7 @@ ByteBuffer FileDescription::read_entire_file()
ssize_t FileDescription::get_dir_entries(u8* buffer, ssize_t size)
{
LOCKER(m_lock);
LOCKER(m_lock, Lock::Mode::Shared);
if (!is_directory())
return -ENOTDIR;

6
Kernel/FileSystem/ProcFS.cpp
View file

@ -491,7 +491,7 @@ Optional<KBuffer> procfs$net_arp(InodeIdentifier)
{
KBufferBuilder builder;
JsonArraySerializer array { builder };
LOCKER(arp_table().lock());
LOCKER(arp_table().lock(), Lock::Mode::Shared);
for (auto& it : arp_table().resource()) {
auto obj = array.add_object();
obj.add("mac_address", it.value.to_string());
@ -983,7 +983,7 @@ static ByteBuffer read_sys_bool(InodeIdentifier inode_id)
auto buffer = ByteBuffer::create_uninitialized(2);
auto* lockable_bool = reinterpret_cast<Lockable<bool>*>(variable.address);
{
LOCKER(lockable_bool->lock());
LOCKER(lockable_bool->lock(), Lock::Mode::Shared);
buffer[0] = lockable_bool->resource() ? '1' : '0';
}
buffer[1] = '\n';
@ -1013,7 +1013,7 @@ static ByteBuffer read_sys_string(InodeIdentifier inode_id)
ASSERT(variable.type == SysVariable::Type::String);
auto* lockable_string = reinterpret_cast<Lockable<String>*>(variable.address);
LOCKER(lockable_string->lock());
LOCKER(lockable_string->lock(), Lock::Mode::Shared);
return lockable_string->resource().to_byte_buffer();
}

12
Kernel/FileSystem/TmpFS.cpp
View file

@ -81,7 +81,7 @@ unsigned TmpFS::next_inode_index()
RefPtr<Inode> TmpFS::get_inode(InodeIdentifier identifier) const
{
LOCKER(m_lock);
LOCKER(m_lock, Lock::Mode::Shared);
ASSERT(identifier.fsid() == fsid());
auto it = m_inodes.find(identifier.index());
@ -161,14 +161,14 @@ NonnullRefPtr<TmpFSInode> TmpFSInode::create_root(TmpFS& fs)
InodeMetadata TmpFSInode::metadata() const
{
LOCKER(m_lock);
LOCKER(m_lock, Lock::Mode::Shared);
return m_metadata;
}
bool TmpFSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntry&)> callback) const
{
LOCKER(m_lock);
LOCKER(m_lock, Lock::Mode::Shared);
if (!is_directory())
return false;
@ -183,7 +183,7 @@ bool TmpFSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntry&)>
ssize_t TmpFSInode::read_bytes(off_t offset, ssize_t size, u8* buffer, FileDescription*) const
{
LOCKER(m_lock);
LOCKER(m_lock, Lock::Mode::Shared);
ASSERT(!is_directory());
ASSERT(size >= 0);
ASSERT(offset >= 0);
@ -247,7 +247,7 @@ ssize_t TmpFSInode::write_bytes(off_t offset, ssize_t size, const u8* buffer, Fi
RefPtr<Inode> TmpFSInode::lookup(StringView name)
{
LOCKER(m_lock);
LOCKER(m_lock, Lock::Mode::Shared);
ASSERT(is_directory());
if (name == ".")
@ -263,7 +263,7 @@ RefPtr<Inode> TmpFSInode::lookup(StringView name)
size_t TmpFSInode::directory_entry_count() const
{
LOCKER(m_lock);
LOCKER(m_lock, Lock::Mode::Shared);
ASSERT(is_directory());
return 2 + m_children.size();
}