diff options
| author | Liav A <liavalb@gmail.com> | 2021-09-10 14:44:46 +0300 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-09-11 11:41:14 +0200 |
| commit | f5de4f24b260515f703a3a6ea183046f45cd4ce8 (patch) | |
| tree | dadab2487c0fd610f188151ff1bfdcc6bb7c84b8 /Kernel/Devices/FullDevice.cpp | |
| parent | c545d4ffcb93e95d8226dff996fcb38f92c48d14 (diff) | |
| download | serenity-f5de4f24b260515f703a3a6ea183046f45cd4ce8.zip | |
Kernel/Devices: Defer creation of SysFS component after the constructor
Instead of doing so in the constructor, let's do immediately after the
constructor, so we can safely pass a reference of a Device, so the
SysFSDeviceComponent constructor can use that object to identify whether
it's a block device or a character device.
This allows to us to not hold a device in SysFSDeviceComponent with a
RefPtr.
Also, we also call the before_removing method in both SlavePTY::unref
and File::unref, so because Device has that method being overrided, it
can ensure the device is removed always cleanly.
Diffstat (limited to 'Kernel/Devices/FullDevice.cpp')
| -rw-r--r-- | Kernel/Devices/FullDevice.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Kernel/Devices/FullDevice.cpp b/Kernel/Devices/FullDevice.cpp index b8b0488722..df425cfcea 100644 --- a/Kernel/Devices/FullDevice.cpp +++ b/Kernel/Devices/FullDevice.cpp @@ -13,7 +13,10 @@ namespace Kernel { UNMAP_AFTER_INIT NonnullRefPtr<FullDevice> FullDevice::must_create() { - return adopt_ref(*new FullDevice); + auto full_device_or_error = try_create_device<FullDevice>(); + // FIXME: Find a way to propagate errors + VERIFY(!full_device_or_error.is_error()); + return full_device_or_error.release_value(); } UNMAP_AFTER_INIT FullDevice::FullDevice() |