remove prev_entry next_entry from DirEntry

Author: wasm-forge

stable-fs/src/fs.rs

@@ -11,8 +11,8 @@ use crate::{
         types::{RIGHTS_FD_READ, RIGHTS_FD_WRITE},
     },
     storage::{
-        types::{DirEntry, DirEntryIndex, FileType, Metadata, Node},
         Storage,
+        types::{DirEntry, DirEntryIndex, FileType, Metadata, Node},
     },
 };
 
@@ -292,10 +292,6 @@ impl FileSystem {
         Ok(())
     }
 
-    fn get_node_direntry(&self, node: Node, index: DirEntryIndex) -> Result<DirEntry, Error> {
-        self.storage.get_direntry(node, index)
-    }
-
     fn put_dir(&mut self, fd: Fd, dir: Dir) {
         self.fd_table.update(fd, FdEntry::Dir(dir))
     }

stable-fs/src/runtime/structure_helpers.rs

@@ -19,8 +19,6 @@ struct EntryFindResult {
     node: Node,
     parent_dir: Node,
     entry_index: DirEntryIndex,
-    prev_entry: Option<DirEntryIndex>,
-    next_entry: Option<DirEntryIndex>,
 }
 
 fn get_path_parts(path: &str) -> Result<(Vec<String>, bool), Error> {
@@ -66,25 +64,19 @@ fn find_node_with_index(
     let mut parent_dir_node = parent_dir_node;
     let mut cur_node = parent_dir_node;
     let mut cur_entry_index = 0;
-    let mut prev_entry_index = None;
-    let mut next_entry_index = None;
 
     for part in parts {
         parent_dir_node = cur_node;
         cur_entry_index = find_entry_index(parent_dir_node, part.as_bytes(), storage)?;
         let entry = storage.get_direntry(cur_node, cur_entry_index)?;
 
         cur_node = entry.node;
-        prev_entry_index = entry.prev_entry;
-        next_entry_index = entry.next_entry;
     }
 
     Ok(EntryFindResult {
         node: cur_node,
         parent_dir: parent_dir_node,
         entry_index: cur_entry_index,
-        prev_entry: prev_entry_index,
-        next_entry: next_entry_index,
     })
 }
 
@@ -362,8 +354,6 @@ pub fn add_dir_entry(
         DirEntry {
             node: new_node,
             name,
-            next_entry: None,
-            prev_entry: None,
             entry_type: Some(file_type),
         },
     );
@@ -404,8 +394,6 @@ pub fn rm_dir_entry(
 
     let parent_dir_node = find_result.parent_dir;
     let removed_entry_index = find_result.entry_index;
-    let removed_dir_entry_prev_entry = find_result.prev_entry;
-    let removed_dir_entry_next_entry = find_result.next_entry;
 
     let mut removed_metadata = storage.get_metadata(removed_dir_entry_node)?;
 
@@ -437,20 +425,6 @@ pub fn rm_dir_entry(
         return Err(Error::TextFileBusy);
     }
 
-    // update previous entry
-    if let Some(prev_dir_entry_index) = removed_dir_entry_prev_entry {
-        let mut prev_dir_entry = storage.get_direntry(parent_dir_node, prev_dir_entry_index)?;
-        prev_dir_entry.next_entry = removed_dir_entry_next_entry;
-        storage.put_direntry(parent_dir_node, prev_dir_entry_index, prev_dir_entry)
-    }
-
-    // update next entry
-    if let Some(next_dir_entry_index) = removed_dir_entry_next_entry {
-        let mut next_dir_entry = storage.get_direntry(parent_dir_node, next_dir_entry_index)?;
-        next_dir_entry.prev_entry = removed_dir_entry_prev_entry;
-        storage.put_direntry(parent_dir_node, next_dir_entry_index, next_dir_entry)
-    }
-
     let mut parent_dir_metadata = storage.get_metadata(parent_dir_node)?;
 
     // dir entry size is reduced by one

stable-fs/src/storage/stable.rs

@@ -1138,8 +1138,6 @@ mod tests {
             DirEntry {
                 node,
                 name: FileName::new("test".as_bytes()).unwrap(),
-                next_entry: Some(42),
-                prev_entry: Some(24),
                 entry_type: None,
             },
         );
@@ -1149,8 +1147,6 @@ mod tests {
             direntry.name.bytes,
             FileName::new("test".as_bytes()).unwrap().bytes
         );
-        assert_eq!(direntry.next_entry, Some(42));
-        assert_eq!(direntry.prev_entry, Some(24));
     }
 
     fn new_file<M: Memory>(storage: &mut StableStorage<M>) -> Node {

stable-fs/src/storage/types.rs

@@ -35,8 +35,6 @@ pub const DUMMY_DOT_ENTRY: (DirEntryIndex, DirEntry) = (
             },
         },
         node: 0,
-        next_entry: None,
-        prev_entry: None,
         entry_type: None,
     },
 );
@@ -54,8 +52,6 @@ pub const DUMMY_DOT_DOT_ENTRY: (DirEntryIndex, DirEntry) = (
             },
         },
         node: 0,
-        next_entry: None,
-        prev_entry: None,
         entry_type: None,
     },
 );
@@ -283,8 +279,6 @@ pub type DirEntryIndex = u32;
 pub struct DirEntry {
     pub name: FileName,
     pub node: Node,
-    pub next_entry: Option<DirEntryIndex>,
-    pub prev_entry: Option<DirEntryIndex>,
     pub entry_type: Option<FileType>,
 }