diff --git a/modules/page/src/buffer_cache.rs b/modules/page/src/buffer_cache.rs index 5c67cfdd..86f86069 100644 --- a/modules/page/src/buffer_cache.rs +++ b/modules/page/src/buffer_cache.rs @@ -48,21 +48,21 @@ impl BufferCache { } pub fn read_block(&mut self, block_id: usize, buf: &mut [u8]) { - // let buffer_head = self.get_buffer_head_from_disk(block_id); - // if buffer_head.has_cached() { - // buffer_head.read_block(buf) - // } else { - self.device().base_read_block(block_id, buf) - // } + let buffer_head = self.get_buffer_head_from_disk(block_id); + if buffer_head.has_cached() { + buffer_head.read_block(buf) + } else { + self.device().base_read_block(block_id, buf) + } } pub fn write_block(&mut self, block_id: usize, buf: &[u8]) { - // let buffer_head = self.get_buffer_head_from_disk(block_id); - // if buffer_head.has_cached() { - // buffer_head.write_block(buf) - // } else { - self.device().base_write_block(block_id, buf) - // } + let buffer_head = self.get_buffer_head_from_disk(block_id); + if buffer_head.has_cached() { + buffer_head.write_block(buf) + } else { + self.device().base_write_block(block_id, buf) + } } pub fn get_buffer_head_from_disk(&mut self, block_id: usize) -> Arc { diff --git a/modules/vfs-core/src/dentry.rs b/modules/vfs-core/src/dentry.rs index abbcb56d..2946545a 100644 --- a/modules/vfs-core/src/dentry.rs +++ b/modules/vfs-core/src/dentry.rs @@ -187,11 +187,6 @@ impl dyn Dentry { } pub fn lookup(self: &Arc, name: &str) -> SysResult> { - // let hash_key = HashKey::new(self, name)?; - // if let Some(child) = dcache().get(hash_key) { - // log::warn!("[Dentry::lookup] find child in hash"); - // return Ok(child); - // } if !self.inode()?.itype().is_dir() { return Err(SysError::ENOTDIR); } @@ -252,7 +247,6 @@ impl dyn Dentry { /// Create a negetive child dentry with `name`. pub fn new_child(self: &Arc, name: &str) -> Arc { let child = self.clone().base_new_child(name); - // dcache().insert(child.clone()); child }