diff --git a/Kernel/Devices/Device.cpp b/Kernel/Devices/Device.cpp index e04f196e5b..0163c94736 100644 --- a/Kernel/Devices/Device.cpp +++ b/Kernel/Devices/Device.cpp @@ -15,7 +15,8 @@ Device::~Device() KResultOr> Device::open(int options) { - return VFS::the().open(*this, options); + UNUSED_PARAM(options); + return FileDescriptor::create(this); } void Device::close() diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp index e3a1737d35..1a6bf241df 100644 --- a/Kernel/FileSystem/VirtualFileSystem.cpp +++ b/Kernel/FileSystem/VirtualFileSystem.cpp @@ -120,13 +120,6 @@ void VFS::traverse_directory_inode(Inode& dir_inode, Function> VFS::open(RetainPtr&& device, int options) -{ - // FIXME: Respect options. - (void)options; - return FileDescriptor::create(move(device)); -} - KResult VFS::utime(StringView path, Inode& base, time_t atime, time_t mtime) { auto descriptor_or_error = VFS::the().open(move(path), 0, 0, base); diff --git a/Kernel/TTY/PTYMultiplexer.cpp b/Kernel/TTY/PTYMultiplexer.cpp index 35852474df..9d519d74e5 100644 --- a/Kernel/TTY/PTYMultiplexer.cpp +++ b/Kernel/TTY/PTYMultiplexer.cpp @@ -30,6 +30,7 @@ PTYMultiplexer::~PTYMultiplexer() KResultOr> PTYMultiplexer::open(int options) { + UNUSED_PARAM(options); LOCKER(m_lock); if (m_freelist.is_empty()) return KResult(-EBUSY); @@ -38,7 +39,7 @@ KResultOr> PTYMultiplexer::open(int options) #ifdef PTMX_DEBUG dbgprintf("PTYMultiplexer::open: Vending master %u\n", master->index()); #endif - return VFS::the().open(move(master), options); + return FileDescriptor::create(master.ptr()); } void PTYMultiplexer::notify_master_destroyed(Badge, unsigned index)