Changeset 155f792 in mainline for uspace/srv/fs/minixfs/mfs.h

Timestamp:

2011-03-20T11:30:25Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6adba0a8

Parents:

930baca

Message:

Use a generic minixfs inode in core to avoid code duplication

File:

• uspace/srv/fs/minixfs/mfs.h (modified) (3 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -82 +82 @@
 };
 
+/*Generic MinixFS inode*/
+struct mfs_ino_info {
+        uint16_t        i_mode;
+        uint16_t        i_nlinks;
+        int16_t         i_uid;
+        uint16_t        i_gid;
+        int32_t         i_size;
+        int32_t         i_atime;
+        int32_t         i_mtime;
+        int32_t         i_ctime;
+        /*Block numbers for direct zones*/
+        uint32_t        i_dzone[V2_NR_DIRECT_ZONES];
+        /*Block numbers for indirect zones*/
+        uint32_t        i_izone[V2_NR_INDIRECT_ZONES];
+};
+
 struct mfs_instance {
         link_t link;
@@ -90 +106 @@
 /*MinixFS node in core*/
 struct mfs_node {
-        union {
-                struct mfs_inode *ino;
-                struct mfs2_inode *ino2;
-        };
-
+        struct mfs_ino_info *ino_i;
         struct mfs_instance *instance;
 };
@@ -115 +127 @@
 /*mfs_inode.c*/
 extern
-struct mfs_inode *mfs_read_inode_raw(const struct mfs_instance *instance, 
+struct mfs_ino_info *mfs_read_inode_raw(const struct mfs_instance *instance, 
                                         uint16_t inum);
 extern
-struct mfs2_inode *mfs2_read_inode_raw(const struct mfs_instance *instance,
+struct mfs_ino_info *mfs2_read_inode_raw(const struct mfs_instance *instance,
                                         uint32_t inum);