From 4c34414b26bf71e747ea3ecb2586645bab4aba52 Mon Sep 17 00:00:00 2001
From: Chuyan Zhang <me@zcy.moe>
Date: Fri, 1 Dec 2023 19:42:13 -0800
Subject: Multiple bugfix, it works!

---
 ayafs-core/src/memory/dir_entry.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'ayafs-core/src/memory/dir_entry.rs')

diff --git a/ayafs-core/src/memory/dir_entry.rs b/ayafs-core/src/memory/dir_entry.rs
index 55c67bd..3880f61 100644
--- a/ayafs-core/src/memory/dir_entry.rs
+++ b/ayafs-core/src/memory/dir_entry.rs
@@ -38,9 +38,11 @@ impl AyaFS {
 
             match self.access_block::<DirectoryBlock>(inode, block_index_within_inode) {
                 Some(directory_block) => {
+                    debug!("bitmap for block is {:#b} {:#b}", directory_block.block.occupancy[0], directory_block.block.occupancy[1]);
                     if directory_block.block.query(entry_index_within_block) {
                         let dir_entry = &directory_block.block.entries[entry_index_within_block];
                         let name = dir_entry.name();
+                        debug!("loaded entry({:?}) for inode {}", name.as_os_str(), index);
                         dir_entry_map.insert(name, dir_entry.clone());
                     } else {
                         break;
@@ -70,7 +72,7 @@ impl AyaFS {
         parent_inode: &mut Inode,
         dir_entry_map: IndexMap<OsString, DirectoryEntry>,
     ) -> Result<(), c_int> {
-        for (entry_index, (_, dir_entry)) in dir_entry_map.into_iter().enumerate() {
+        for (entry_index, (name, dir_entry)) in dir_entry_map.into_iter().enumerate() {
             let block_index_within_inode = entry_index / 15;
             let entry_index_within_block = entry_index % 15;
             // 不够就新分配
@@ -89,7 +91,13 @@ impl AyaFS {
             }
             match self.access_block_mut::<DirectoryBlock>(parent_inode, block_index_within_inode) {
                 Some(directory_block) => {
+                    if entry_index_within_block == 0 {
+                        directory_block.block.reset();
+                    }
+                    directory_block.dirty = true;
+                    debug!("entry {} (block {} offset {}) for inode {}, name {:?}", entry_index, block_index_within_inode, entry_index_within_block, _parent_index, name);
                     directory_block.block.allocate(entry_index_within_block);
+                    debug!("bitmap for block is {:#b} {:#b}", directory_block.block.occupancy[0], directory_block.block.occupancy[1]);
                     directory_block.block.entries[entry_index_within_block] = dir_entry;
                 }
                 None => {
@@ -291,10 +299,10 @@ impl AyaFS {
         } else {
             let mut entry_index = 0;
             while entry_index < parent_inode.size {
-                if let Ok(entry) = self.get_direntry(parent_index, parent_inode, entry_index) {
+                if let Ok(entry) = self.get_direntry(parent_index, parent_inode, entry_index as u32) {
                     if entry.name() == name {
                         let inode = self.get_inode(entry.inode as usize).unwrap().clone();
-                        return Ok((entry.inode, entry_index, inode));
+                        return Ok((entry.inode, entry_index as u32, inode));
                     }
                 }
                 entry_index += 1;
-- 
cgit v1.2.3-70-g09d2