finish

Author: Docter-R

easy-fs/src/efs.rs

@@ -5,6 +5,7 @@ use super::{
 use crate::BLOCK_SZ;
 use alloc::sync::Arc;
 use spin::Mutex;
+use core::mem::size_of;
 ///An easy file system on block
 pub struct EasyFileSystem {
     ///Real device
@@ -148,4 +149,14 @@ impl EasyFileSystem {
             (block_id - self.data_area_start_block) as usize,
         )
     }
+
+    /// 从块号和块内偏移计算inode编号
+    pub fn get_inode_id(&self, block_id: u32, block_offset: usize) -> u32 {
+        // 计算 inode 在 inode 区域中的索引
+        let inodes_per_block = (BLOCK_SZ / size_of::<DiskInode>()) as u32;
+        let inode_block_index = block_id - self.inode_area_start_block;
+        let inode_index_in_block = block_offset / size_of::<DiskInode>();
+        
+        inode_block_index * inodes_per_block + inode_index_in_block as u32
+    }
 }

easy-fs/src/layout.rs

@@ -86,6 +86,7 @@ pub struct DiskInode {
     pub indirect1: u32,
     pub indirect2: u32,
     type_: DiskInodeType,
+    pub nlink: u32,        // 新增：硬链接计数
 }
 
 impl DiskInode {
@@ -97,6 +98,7 @@ impl DiskInode {
         self.indirect1 = 0;
         self.indirect2 = 0;
         self.type_ = type_;
+        self.nlink = 1; // 初始化硬链接计数为1
     }
     /// Whether this inode is a directory
     pub fn is_dir(&self) -> bool {