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

Timestamp:

2011-04-06T18:32:00Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8ab1adff

Parents:

40f7297

Message:

Add function get_inode(), it is used to obtain a generic minix inode without
messing around with these ugly "if (fsversion == x) .. else if (fsversion == y)…"

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (2 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -387 +387 @@
         int rc;
 
-        const struct mfs_sb_info *sbi = inst->sbi;
-
         node = malloc(sizeof(fs_node_t));
         if (!node) {
@@ -405 +403 @@
         struct mfs_ino_info *ino_i;
 
-        if (sbi->fs_version == MFS_VERSION_V1) {
-                /*Read MFS V1 inode*/
-                ino_i = mfs_read_inode_raw(inst, index);
-        } else {
-                /*Read MFS V2/V3 inode*/
-                ino_i = mfs2_read_inode_raw(inst, index);
-        }
-
-        if (!ino_i)
+        rc = get_inode(inst, &ino_i, index);
+        if (rc != EOK)
                 goto out_err;