From 8a45cd95353ae9fe1286dbc4fcd36faaa66c9f82 Mon Sep 17 00:00:00 2001
From: Chuyan Zhang <me@zcy.moe>
Date: Sun, 19 Nov 2023 01:03:19 -0800
Subject: Layer 1 test not passing

---
 src/memory/cached_inode.rs | 48 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

(limited to 'src/memory/cached_inode.rs')

diff --git a/src/memory/cached_inode.rs b/src/memory/cached_inode.rs
index b51d279..b81bd2e 100644
--- a/src/memory/cached_inode.rs
+++ b/src/memory/cached_inode.rs
@@ -1,7 +1,7 @@
-use and_then_some::BoolExt;
+use crate::disk::block::{Block, InodeBlock};
+use crate::disk::inode::{Inode, InodeMode, INODE_SIZE};
 use crate::AyaFS;
-use crate::disk::data_block::InodeBlock;
-use crate::disk::inode::{Inode, INODE_SIZE, InodeMode};
+use and_then_some::BoolExt;
 
 impl AyaFS {
     pub(crate) fn create_inode(
@@ -30,10 +30,24 @@ impl AyaFS {
         })
     }
 
+    pub(crate) fn update_inode(&mut self, inode_index: usize, inode: Inode) -> bool {
+        if self.inode_bitmap.query(inode_index) {
+            let (block_index, offset) = self.locate_inode(inode_index);
+            if let Some(cached_block) = self.cached_inodes.get_block_mut::<InodeBlock>(block_index)
+            {
+                cached_block.block.inodes[offset / INODE_SIZE] = inode;
+            }
+            true
+        } else {
+            false
+        }
+    }
+
     pub(crate) fn get_inode(&mut self, inode_index: usize) -> Option<&Inode> {
         self.inode_bitmap.query(inode_index).and_then(|| {
             let (block_index, offset) = self.locate_inode(inode_index);
-            self.get_block::<InodeBlock>(block_index)
+            self.cached_inodes
+                .get_block::<InodeBlock>(block_index)
                 .map(|cached_block| &cached_block.block.inodes[offset / INODE_SIZE])
         })
     }
@@ -41,11 +55,33 @@ impl AyaFS {
     pub(crate) fn get_inode_mut(&mut self, inode_index: usize) -> Option<&mut Inode> {
         self.inode_bitmap.query(inode_index).and_then(|| {
             let (block_index, offset) = self.locate_inode(inode_index);
-            self.get_block_mut::<InodeBlock>(block_index)
+            self.cached_inodes
+                .get_block_mut::<InodeBlock>(block_index)
+                .map(|cached_block| {
+                    cached_block.dirty = true; // 保守一些, 只要返回了 &mut Inode 这个页一定标记为脏
+                    &mut cached_block.block.inodes[offset / INODE_SIZE]
+                })
+        })
+    }
+
+    pub(crate) fn peek_inode(&self, inode_index: usize) -> Option<&Inode> {
+        self.inode_bitmap.query(inode_index).and_then(|| {
+            let (block_index, offset) = self.locate_inode(inode_index);
+            self.cached_inodes
+                .peek_block::<InodeBlock>(block_index)
+                .map(|cached_block| &cached_block.block.inodes[offset / INODE_SIZE])
+        })
+    }
+
+    pub(crate) fn peek_inode_mut(&mut self, inode_index: usize) -> Option<&mut Inode> {
+        self.inode_bitmap.query(inode_index).and_then(|| {
+            let (block_index, offset) = self.locate_inode(inode_index);
+            self.cached_inodes
+                .peek_block_mut::<InodeBlock>(block_index)
                 .map(|cached_block| {
                     cached_block.dirty = true; // 保守一些, 只要返回了 &mut Inode 这个页一定标记为脏
                     &mut cached_block.block.inodes[offset / INODE_SIZE]
                 })
         })
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-70-g09d2