1 files changed, 11 insertions, 1 deletions

diff --git a/rsnix/src/fat.rs b/rsnix/src/fat.rs
index bad01cd..eda81ed 100644
--- a/rsnix/src/fat.rs
+++ b/rsnix/src/fat.rs
@@ -167,8 +167,18 @@ fn write_sector(lba: u64, data: &[u8; SECTOR]) -> Result<(), ()> {
 
 // --- cluster math ----------------------------------------------------------
 
+/// Current volume's metadata — only ever reached with a selected volume
+/// (the fs layer calls `select_vol` first), so a missing slot is a kernel
+/// invariant violation, not a recoverable error.
 fn v() -> &'static mut Volume {
-    vols().get_mut(*active_vol()).unwrap()
+    let i = *active_vol();
+    match vols().get_mut(i) {
+        Some(v) => v,
+        None => {
+            crate::serial_println!("fat: internal error — no volume at slot {}", i);
+            crate::interrupts::halt();
+        }
+    }
 }
 
 fn spc() -> usize {