Changeset 155f792 in mainline for uspace/srv/fs/minixfs/mfs_ops.c

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_ops.c (modified) (5 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -212 +212 @@
 aoff64_t mfs_size_get(fs_node_t *node)
 {
-        aoff64_t size;
-
         mfsdebug("request for inode size\n");
         assert(node);
@@ -219 +217 @@
         const struct mfs_node *mnode = node->data;
         assert(mnode);
-
-        const struct mfs_instance *inst = mnode->instance;
-        assert(inst);
-
-        const struct mfs_sb_info *sbi = inst->sbi;
-        assert(sbi);
-
-        if (sbi->fs_version == MFS_VERSION_V1) {
-                struct mfs_inode *ino;
-                ino = mnode->ino;
-                size = ino->i_size;
-        } else {
-                struct mfs2_inode *ino2;
-                ino2 = mnode->ino2;
-                size = ino2->i_size;
-        }
-
-        return size;
+        assert(mnode->ino_i);
+
+        return mnode->ino_i->i_size;
 }
 
@@ -282 +265 @@
         }
 
+        struct mfs_ino_info *ino_i;
+
         if (sbi->fs_version == MFS_VERSION_V1) {
                 /*Read MFS V1 inode*/
-                struct mfs_inode *ino;
-
-                ino = mfs_read_inode_raw(inst, index);
-                mnode->ino = ino;
+                ino_i = mfs_read_inode_raw(inst, index);
         } else {
                 /*Read MFS V2/V3 inode*/
-                struct mfs2_inode *ino2;
-
-                ino2 = mfs2_read_inode_raw(inst, index);
-                mnode->ino2 = ino2;
-        }
+                ino_i = mfs2_read_inode_raw(inst, index);
+        }
+
+        if (!ino_i)
+                return -1;
+
+        mnode->ino_i = ino_i;
 
         mnode->instance = inst;
@@ -313 +297 @@
 {
         const struct mfs_node *node = fsnode->data;
-        const struct mfs_sb_info *sbi = node->instance->sbi;
-
-        if (sbi->fs_version == MFS_VERSION_V1)
-                return S_ISDIR(node->ino->i_mode);
-        else
-                return S_ISDIR(node->ino2->i_mode);
+        return S_ISDIR(node->ino_i->i_mode);
 }
 
@@ -324 +303 @@
 {
         struct mfs_node *node = fsnode->data;
-        struct mfs_sb_info *sbi = node->instance->sbi;
-
-        if (sbi->fs_version == MFS_VERSION_V1)
-                return S_ISREG(node->ino->i_mode);
-        else
-                return S_ISREG(node->ino2->i_mode);
+        return S_ISREG(node->ino_i->i_mode);
 }