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

Kernel/VirtualFileSystem: Allow unmounting via inode and mount path

Browse source 
This pair of information uniquely identifies any mount point, and it can
be used in situations where mount point custodies are not available.
This commit is contained in:
kleines Filmröllchen 2023-06-17 18:17:00 +02:00 • committed by Jelle Raaijmakers
parent abc1eaff36
commit 8940552d1d
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -267,15 +267,18 @@ ErrorOr<void> VirtualFileSystem::unmount(Custody& mountpoint_custody)
{ {
auto& guest_inode = mountpoint_custody.inode(); auto& guest_inode = mountpoint_custody.inode();
auto custody_path = TRY(mountpoint_custody.try_serialize_absolute_path()); auto custody_path = TRY(mountpoint_custody.try_serialize_absolute_path());
dbgln("VirtualFileSystem: unmount called with inode {} on mountpoint {}", guest_inode.identifier(), custody_path->view()); return unmount(guest_inode, custody_path->view());
}
ErrorOr<void> VirtualFileSystem::unmount(Inode& guest_inode, StringView custody_path)
{
return m_file_backed_file_systems_list.with_exclusive([&](auto& file_backed_fs_list) -> ErrorOr<void> { return m_file_backed_file_systems_list.with_exclusive([&](auto& file_backed_fs_list) -> ErrorOr<void> {
TRY(m_mounts.with([&](auto& mounts) -> ErrorOr<void> { TRY(m_mounts.with([&](auto& mounts) -> ErrorOr<void> {
for (auto& mount : mounts) { for (auto& mount : mounts) {
if (&mount.guest() != &guest_inode) if (&mount.guest() != &guest_inode)
continue; continue;
auto mountpoint_path = TRY(mount.absolute_path()); auto mountpoint_path = TRY(mount.absolute_path());
if (custody_path->view() != mountpoint_path->view()) if (custody_path != mountpoint_path->view())
continue; continue;
NonnullRefPtr<FileSystem> fs = mount.guest_fs(); NonnullRefPtr<FileSystem> fs = mount.guest_fs();
TRY(fs->prepare_to_unmount(mount.guest())); TRY(fs->prepare_to_unmount(mount.guest()));

1
Kernel/FileSystem/VirtualFileSystem.h
View file

@ -62,6 +62,7 @@ public:
ErrorOr<void> bind_mount(Custody& source, Custody& mount_point, int flags); ErrorOr<void> bind_mount(Custody& source, Custody& mount_point, int flags);
ErrorOr<void> remount(Custody& mount_point, int new_flags); ErrorOr<void> remount(Custody& mount_point, int new_flags);
ErrorOr<void> unmount(Custody& mount_point); ErrorOr<void> unmount(Custody& mount_point);
ErrorOr<void> unmount(Inode& guest_inode, StringView custody_path);
ErrorOr<NonnullRefPtr<OpenFileDescription>> open(Credentials const&, StringView path, int options, mode_t mode, Custody& base, Optional<UidAndGid> = {}); ErrorOr<NonnullRefPtr<OpenFileDescription>> open(Credentials const&, StringView path, int options, mode_t mode, Custody& base, Optional<UidAndGid> = {});
ErrorOr<NonnullRefPtr<OpenFileDescription>> open(Process const&, Credentials const&, StringView path, int options, mode_t mode, Custody& base, Optional<UidAndGid> = {}); ErrorOr<NonnullRefPtr<OpenFileDescription>> open(Process const&, Credentials const&, StringView path, int options, mode_t mode, Custody& base, Optional<UidAndGid> = {});