Merge branch 'ext2' into 'develop-BA-FS26'HEADdevelop-BA-FS26

ext2 and tests

See merge request teachos/kernel!22

1 files changed, 4 insertions, 3 deletions

diff --git a/kernel/src/devices/block_device_utils.cpp b/kernel/src/devices/block_device_utils.cpp
index 6fe89fe..59e9b97 100644
--- a/kernel/src/devices/block_device_utils.cpp
+++ b/kernel/src/devices/block_device_utils.cpp
@@ -1,9 +1,9 @@
 #include "kernel/devices/block_device_utils.hpp"
 
+#include "kapi/devices/device.hpp"
 #include "kapi/system.hpp"
 
 #include "kernel/devices/block_device.hpp"
-#include "kapi/devices/device.hpp"
 
 #include <kstd/cstring>
 #include <kstd/memory>
@@ -31,12 +31,13 @@ namespace kernel::devices::block_device_utils
       return 0;
     }
 
-    auto * block_dev = static_cast<devices::block_device *>(device.get());
-    if (block_dev == nullptr)
+    if (!device->is_block_device())
     {
       kapi::system::panic("[FILESYSTEM] device_file: expected block_device.");
     }
 
+    auto * block_dev = static_cast<devices::block_device *>(device.get());
+
     size_t const block_size = block_dev->block_size();
     size_t const capacity = block_dev->capacity();