소스 검색

Kernel: Add missing error check when opening root file system

Andreas Kling 3 년 전
부모
커밋
4b3bc3805b
1개의 변경된 파일7개의 추가작업 그리고 3개의 파일을 삭제
  1. 7 3
      Kernel/Storage/StorageManagement.cpp

+ 7 - 3
Kernel/Storage/StorageManagement.cpp

@@ -182,11 +182,15 @@ NonnullRefPtr<FileSystem> StorageManagement::root_filesystem() const
     if (!boot_device_description) {
         PANIC("StorageManagement: Couldn't find a suitable device to boot from");
     }
-    auto e2fs = Ext2FS::create(FileDescription::try_create(boot_device_description.release_nonnull()).value());
-    if (auto result = e2fs->initialize(); result.is_error()) {
+    auto description_or_error = FileDescription::try_create(boot_device_description.release_nonnull());
+    VERIFY(!description_or_error.is_error());
+
+    auto file_system = Ext2FS::create(description_or_error.release_value());
+
+    if (auto result = file_system->initialize(); result.is_error()) {
         PANIC("StorageManagement: Couldn't open root filesystem: {}", result);
     }
-    return e2fs;
+    return file_system;
 }
 
 bool StorageManagement::initialized()