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

Kernel: Rename vmo => vmobject everywhere

Browse source
This commit is contained in:
Andreas Kling 2019-12-19 19:13:44 +01:00
parent 8ea4217c01
commit b6ee8a2c8d
15 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/FileSystem/Inode.cpp
View file

@ -114,9 +114,9 @@ int Inode::decrement_link_count()
return -ENOTIMPL;
}
void Inode::set_vmo(VMObject& vmo)
void Inode::set_vmobject(VMObject& vmobject)
{
m_vmobject = vmo.make_weak_ptr();
m_vmobject = vmobject.make_weak_ptr();
}
bool Inode::bind_socket(LocalSocket& socket)

2
Kernel/FileSystem/Inode.h
View file

@ -71,7 +71,7 @@ public:
void will_be_destroyed();
void set_vmo(VMObject&);
void set_vmobject(VMObject&);
InodeVMObject* vmobject() { return m_vmobject.ptr(); }
const InodeVMObject* vmobject() const { return m_vmobject.ptr(); }

6
Kernel/FileSystem/ProcFS.cpp
View file

@ -74,7 +74,7 @@ enum ProcFileType {
__FI_PID_Start,
FI_PID_vm,
FI_PID_vmo,
FI_PID_vmobjects,
FI_PID_stack,
FI_PID_regs,
FI_PID_fds,
@ -478,7 +478,7 @@ Optional<KBuffer> procfs$net_local(InodeIdentifier)
return builder.build();
}
Optional<KBuffer> procfs$pid_vmo(InodeIdentifier identifier)
Optional<KBuffer> procfs$pid_vmobjects(InodeIdentifier identifier)
{
auto handle = ProcessInspectionHandle::from_pid(to_pid(identifier));
if (!handle)
@ -1374,7 +1374,7 @@ ProcFS::ProcFS()
m_entries[FI_Root_net_local] = { "local", FI_Root_net_local, procfs$net_local };
m_entries[FI_PID_vm] = { "vm", FI_PID_vm, procfs$pid_vm };
m_entries[FI_PID_vmo] = { "vmo", FI_PID_vmo, procfs$pid_vmo };
m_entries[FI_PID_vmobjects] = { "vmobjects", FI_PID_vmobjects, procfs$pid_vmobjects };
m_entries[FI_PID_stack] = { "stack", FI_PID_stack, procfs$pid_stack };
m_entries[FI_PID_regs] = { "regs", FI_PID_regs, procfs$pid_regs };
m_entries[FI_PID_fds] = { "fds", FI_PID_fds, procfs$pid_fds };

2
Kernel/FileSystem/SharedMemory.cpp
View file

@ -93,5 +93,5 @@ KResultOr<Region*> SharedMemory::mmap(Process& process, FileDescription&, Virtua
{
if (!vmobject())
return KResult(-ENODEV);
return process.allocate_region_with_vmo(vaddr, size, *vmobject(), offset, name(), prot);
return process.allocate_region_with_vmobject(vaddr, size, *vmobject(), offset, name(), prot);
}