kernel/rd: fix device numbering

2 files changed, 8 insertions, 6 deletions

diff --git a/kernel/kernel/devices/storage/ram_disk/driver.cpp b/kernel/kernel/devices/storage/ram_disk/driver.cpp
index 50313a7a..4aedf43b 100644
--- a/kernel/kernel/devices/storage/ram_disk/driver.cpp
+++ b/kernel/kernel/devices/storage/ram_disk/driver.cpp
@@ -15,6 +15,7 @@
 #include <kstd/system_error.hpp>
 #include <kstd/units.hpp>
 
+#include <algorithm>
 #include <cstddef>
 #include <cstdint>
 #include <optional>
@@ -108,7 +109,13 @@ namespace kernel::devices::storage::ram_disk
     }
 
     auto implementation = kstd::make_shared<struct block_device>(module);
-    auto name = kstd::format("ram{}", m_next_disk_index);
+
+    auto next_index = std::ranges::count_if(
+        kapi::devices::interface_registry::get().all(kapi::devices::block_device::id), [this](auto const & published) {
+          auto published_device = published.device();
+          return published_device && published_device->bound_driver() == this;
+        });
+    auto name = kstd::format("ram{}", next_index);
 
     auto published = kapi::devices::publish_interface<kapi::devices::block_device>(device.shared_from_this(), name,
                                                                                    implementation.get());
@@ -118,7 +125,6 @@ namespace kernel::devices::storage::ram_disk
     }
 
     device.set_driver_data(implementation);
-    ++m_next_disk_index;
 
     return kstd::success();
   }
diff --git a/kernel/kernel/devices/storage/ram_disk/driver.hpp b/kernel/kernel/devices/storage/ram_disk/driver.hpp
index c665eb14..e079d832 100644
--- a/kernel/kernel/devices/storage/ram_disk/driver.hpp
+++ b/kernel/kernel/devices/storage/ram_disk/driver.hpp
@@ -8,7 +8,6 @@
 #include <kstd/result.hpp>
 #include <kstd/units.hpp>
 
-#include <cstddef>
 #include <cstdint>
 #include <optional>
 #include <string_view>
@@ -29,9 +28,6 @@ namespace kernel::devices::storage::ram_disk
 
   protected:
     auto query_interface(kapi::devices::interface interface) -> void * override;
-
-  private:
-    std::size_t m_next_disk_index{};
   };
 
 }  // namespace kernel::devices::storage::ram_disk