Changeset c922bc7 in mainline

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)…"

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (2 diffs)
• mfs_inode.c (modified) (3 diffs)
• mfs_ops.c (modified) (2 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -154 +154 @@
 
 /*mfs_inode.c*/
-extern struct mfs_ino_info *
-mfs_read_inode_raw(const struct mfs_instance *instance, uint16_t inum);
-
-extern struct mfs_ino_info *
-mfs2_read_inode_raw(const struct mfs_instance *instance, uint32_t inum);
+int
+get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
+                                fs_index_t index);
 
 extern int
@@ -164 +162 @@
 
 int
-mfs_inode_grow(struct mfs_node *mnode, unsigned size_grow);
+inode_grow(struct mfs_node *mnode, unsigned size_grow);
 
 /*mfs_rw.c*/

uspace/srv/fs/minixfs/mfs_inode.c

@@ -44 +44 @@
 mfs2_write_inode_raw(struct mfs_node *mnode);
 
-struct mfs_ino_info *
+static struct mfs_ino_info *
+mfs_read_inode_raw(const struct mfs_instance *instance, uint16_t inum);
+
+static struct mfs_ino_info *
+mfs2_read_inode_raw(const struct mfs_instance *instance, uint32_t inum);
+
+
+int
+get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
+                                fs_index_t index)
+{
+        struct mfs_sb_info *sbi = inst->sbi;
+
+        if (sbi->fs_version == MFS_VERSION_V1) {
+                /*Read a MFS V1 inode*/
+                *ino_i = mfs_read_inode_raw(inst, index);
+        } else {
+                /*Read a MFS V2/V3 inode*/
+                *ino_i = mfs2_read_inode_raw(inst, index);
+        }
+
+        if (*ino_i == NULL)
+                return -1;
+
+        return EOK;
+}
+
+static struct mfs_ino_info *
 mfs_read_inode_raw(const struct mfs_instance *instance, uint16_t inum)
 {
@@ -100 +127 @@
 }
 
-struct mfs_ino_info *
+static struct mfs_ino_info *
 mfs2_read_inode_raw(const struct mfs_instance *instance, uint32_t inum)
 {
@@ -272 +299 @@
 
 int
-mfs_inode_grow(struct mfs_node *mnode, unsigned size_grow)
+inode_grow(struct mfs_node *mnode, unsigned size_grow)
 {
         unsigned i;

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;