1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 23:07:35 +00:00

Kernel: Rename Lock to Mutex

Let's be explicit about what kind of lock this is meant to be.
This commit is contained in:
Andreas Kling 2021-07-17 21:09:51 +02:00
parent a803c4026c
commit cee9528168
51 changed files with 140 additions and 140 deletions

View file

@ -42,7 +42,7 @@ private:
DiskCache& cache() const;
void flush_specific_block_if_needed(BlockIndex index);
mutable Lock m_cache_lock;
mutable Mutex m_cache_lock;
mutable OwnPtr<DiskCache> m_cache;
};

View file

@ -9,7 +9,7 @@
#include <AK/StdLibExtras.h>
#include <Kernel/FileSystem/FIFO.h>
#include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/Lock.h>
#include <Kernel/Mutex.h>
#include <Kernel/Process.h>
#include <Kernel/Thread.h>

View file

@ -8,7 +8,7 @@
#include <Kernel/DoubleBuffer.h>
#include <Kernel/FileSystem/File.h>
#include <Kernel/Lock.h>
#include <Kernel/Mutex.h>
#include <Kernel/UnixTypes.h>
#include <Kernel/WaitQueue.h>
@ -61,7 +61,7 @@ private:
WaitQueue m_read_open_queue;
WaitQueue m_write_open_queue;
Lock m_open_lock;
Mutex m_open_lock;
};
}

View file

@ -219,7 +219,7 @@ KResultOr<NonnullOwnPtr<KBuffer>> FileDescription::read_entire_file()
KResultOr<size_t> FileDescription::get_dir_entries(UserOrKernelBuffer& output_buffer, size_t size)
{
Locker locker(m_lock, Lock::Mode::Shared);
Locker locker(m_lock, Mutex::Mode::Shared);
if (!is_directory())
return ENOTDIR;

View file

@ -156,7 +156,7 @@ private:
bool m_direct : 1 { false };
FIFO::Direction m_fifo_direction { FIFO::Direction::Neither };
Lock m_lock { "FileDescription" };
Mutex m_lock { "FileDescription" };
};
}

View file

@ -12,7 +12,7 @@
#include <Kernel/FileSystem/InodeIdentifier.h>
#include <Kernel/Forward.h>
#include <Kernel/KResult.h>
#include <Kernel/Lock.h>
#include <Kernel/Mutex.h>
#include <Kernel/UnixTypes.h>
#include <Kernel/UserOrKernelBuffer.h>
@ -69,7 +69,7 @@ protected:
void set_block_size(u64 size) { m_block_size = size; }
void set_fragment_size(size_t size) { m_fragment_size = size; }
mutable Lock m_lock { "FS" };
mutable Mutex m_lock { "FS" };
private:
unsigned m_fsid { 0 };

View file

@ -19,7 +19,7 @@
#include <Kernel/FileSystem/InodeMetadata.h>
#include <Kernel/Forward.h>
#include <Kernel/KResult.h>
#include <Kernel/Lock.h>
#include <Kernel/Mutex.h>
namespace Kernel {
@ -109,7 +109,7 @@ protected:
void did_modify_contents();
void did_delete_self();
mutable Lock m_lock { "Inode" };
mutable Mutex m_lock { "Inode" };
private:
FileSystem& m_file_system;

View file

@ -66,7 +66,7 @@ public:
private:
explicit InodeWatcher() { }
mutable Lock m_lock;
mutable Mutex m_lock;
struct Event {
int wd { 0 };

View file

@ -135,7 +135,7 @@ private:
ProtocolVersion m_remote_protocol_version { ProtocolVersion::v9P2000 };
size_t m_max_message_size { 4 * KiB };
Lock m_send_lock { "Plan9FS send" };
Mutex m_send_lock { "Plan9FS send" };
Plan9FSBlockCondition m_completion_blocker;
HashMap<u16, NonnullRefPtr<ReceiveCompletion>> m_completions;

View file

@ -12,7 +12,7 @@
#include <Kernel/FileSystem/Inode.h>
#include <Kernel/Forward.h>
#include <Kernel/KBufferBuilder.h>
#include <Kernel/Lock.h>
#include <Kernel/Mutex.h>
#include <Kernel/ProcessExposed.h>
namespace Kernel {

View file

@ -33,10 +33,10 @@ public:
void register_new_component(SysFSComponent&);
SysFSDirectory& root_folder() { return m_root_folder; }
Lock& get_lock() { return m_lock; }
Mutex& get_lock() { return m_lock; }
private:
Lock m_lock;
Mutex m_lock;
NonnullRefPtr<SysFSRootDirectory> m_root_folder;
};

View file

@ -63,7 +63,7 @@ unsigned TmpFS::next_inode_index()
RefPtr<Inode> TmpFS::get_inode(InodeIdentifier identifier) const
{
Locker locker(m_lock, Lock::Mode::Shared);
Locker locker(m_lock, Mutex::Mode::Shared);
VERIFY(identifier.fsid() == fsid());
auto it = m_inodes.find(identifier.index());
@ -105,14 +105,14 @@ RefPtr<TmpFSInode> TmpFSInode::create_root(TmpFS& fs)
InodeMetadata TmpFSInode::metadata() const
{
Locker locker(m_lock, Lock::Mode::Shared);
Locker locker(m_lock, Mutex::Mode::Shared);
return m_metadata;
}
KResult TmpFSInode::traverse_as_directory(Function<bool(FileSystem::DirectoryEntryView const&)> callback) const
{
Locker locker(m_lock, Lock::Mode::Shared);
Locker locker(m_lock, Mutex::Mode::Shared);
if (!is_directory())
return ENOTDIR;
@ -129,7 +129,7 @@ KResult TmpFSInode::traverse_as_directory(Function<bool(FileSystem::DirectoryEnt
KResultOr<size_t> TmpFSInode::read_bytes(off_t offset, size_t size, UserOrKernelBuffer& buffer, FileDescription*) const
{
Locker locker(m_lock, Lock::Mode::Shared);
Locker locker(m_lock, Mutex::Mode::Shared);
VERIFY(!is_directory());
VERIFY(offset >= 0);
@ -198,7 +198,7 @@ KResultOr<size_t> TmpFSInode::write_bytes(off_t offset, size_t size, const UserO
RefPtr<Inode> TmpFSInode::lookup(StringView name)
{
Locker locker(m_lock, Lock::Mode::Shared);
Locker locker(m_lock, Mutex::Mode::Shared);
VERIFY(is_directory());
if (name == ".")
@ -214,7 +214,7 @@ RefPtr<Inode> TmpFSInode::lookup(StringView name)
KResultOr<size_t> TmpFSInode::directory_entry_count() const
{
Locker locker(m_lock, Lock::Mode::Shared);
Locker locker(m_lock, Mutex::Mode::Shared);
VERIFY(is_directory());
return 2 + m_children.size();
}

View file

@ -86,7 +86,7 @@ private:
Mount* find_mount_for_host(InodeIdentifier);
Mount* find_mount_for_guest(InodeIdentifier);
Lock m_lock { "VFSLock" };
Mutex m_lock { "VFSLock" };
RefPtr<Inode> m_root_inode;
Vector<Mount, 16> m_mounts;