Relocate other in-memory data structures from ext4_types.h

These include ext4_inode_ref, ext4_dir_iter, ext4_dir_search_result
and ext4_dir_idx_block.

diff --git a/include/ext4_dir.h b/include/ext4_dir.h
index 7b068439da658c798aed4da298182059c86bed85..d3b1bf5d8633d305f64a7386aa9fdc69a62d58ad 100644 (file)
--- a/include/ext4_dir.h
+++ b/include/ext4_dir.h
@@ -54,6 +54,19 @@ extern "C" {
 
 #include <stdint.h>
 
+struct ext4_dir_iter {
+       struct ext4_inode_ref *inode_ref;
+       struct ext4_block curr_blk;
+       uint64_t curr_off;
+       struct ext4_dir_en *curr;
+};
+
+struct ext4_dir_search_result {
+       struct ext4_block block;
+       struct ext4_dir_en *dentry;
+};
+
+
 /**@brief Get i-node number from directory entry.
  * @param de Directory entry
  * @return I-node number

diff --git a/include/ext4_dir_idx.h b/include/ext4_dir_idx.h
index d3275d5fc200d369e05db8ee1fa522c63f927dc4..e160374e014f158bbf5b9bb36ea0c0f140e3dbc5 100644 (file)
--- a/include/ext4_dir_idx.h
+++ b/include/ext4_dir_idx.h
@@ -55,8 +55,15 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 
+struct ext4_dir_idx_block {
+       struct ext4_block b;
+       struct ext4_dir_idx_entry *entries;
+       struct ext4_dir_idx_entry *position;
+};
+
 #define EXT4_DIR_DX_INIT_BCNT 2
 
+
 /**@brief Initialize index structure of new directory.
  * @param dir Pointer to directory i-node
  * @param dir Pointer to parent directory i-node

diff --git a/include/ext4_fs.h b/include/ext4_fs.h
index ba55da9c0392bbecc8a1127cfb6924cbd7570814..06eea0e77bb094d2edb358aa57c0614b4b06047e 100644 (file)
--- a/include/ext4_fs.h
+++ b/include/ext4_fs.h
@@ -77,6 +77,14 @@ struct ext4_block_group_ref {
        bool dirty;
 };
 
+struct ext4_inode_ref {
+       struct ext4_block block;
+       struct ext4_inode *inode;
+       struct ext4_fs *fs;
+       uint32_t index;
+       bool dirty;
+};
+
 
 /**@brief Convert block address to relative index in block group.
  * @param sb Superblock pointer

diff --git a/include/ext4_types.h b/include/ext4_types.h
index 2a6094238e00b4f104678d197ac8ed4c7e53d8ed..33137ba2f62cc3c999df392272ef239c28ae688e 100644 (file)
--- a/include/ext4_types.h
+++ b/include/ext4_types.h
@@ -464,13 +464,6 @@ struct ext4_inode {
 
 #define EXT4_INODE_ROOT_INDEX 2
 
-struct ext4_inode_ref {
-       struct ext4_block block;
-       struct ext4_inode *inode;
-       struct ext4_fs *fs;
-       uint32_t index;
-       bool dirty;
-};
 
 #define EXT4_DIRECTORY_FILENAME_LEN 255
 
@@ -506,18 +499,6 @@ struct ext4_dir_en {
        uint8_t name[EXT4_DIRECTORY_FILENAME_LEN]; /* Entry name */
 };
 
-struct ext4_dir_iter {
-       struct ext4_inode_ref *inode_ref;
-       struct ext4_block curr_blk;
-       uint64_t curr_off;
-       struct ext4_dir_en *curr;
-};
-
-struct ext4_dir_search_result {
-       struct ext4_block block;
-       struct ext4_dir_en *dentry;
-};
-
 /* Structures for indexed directory */
 
 struct ext4_dir_idx_climit {
@@ -564,12 +545,6 @@ struct ext4_dir_idx_node {
        struct ext4_dir_idx_entry entries[];
 };
 
-struct ext4_dir_idx_block {
-       struct ext4_block b;
-       struct ext4_dir_idx_entry *entries;
-       struct ext4_dir_idx_entry *position;
-};
-
 /*
  * This goes at the end of each htree block.
  */