Changeset 44c0f5b in mainline

Timestamp:

2011-03-18T19:44:55Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

fe4ac35

Parents:

8b86ed26

Message:

link function mfs_node_get() to the libfs_ops structure

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (1 diff)
• mfs_ops.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -104 +104 @@
 extern bool mfs_is_file(fs_node_t *fsnode);
 extern devmap_handle_t mfs_device_get(fs_node_t *fsnode);
-extern int  mfs_get_instance(devmap_handle_t handle,
+extern int mfs_instance_get(devmap_handle_t handle,
                                 struct mfs_instance **instance);
+int mfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle,
+                        fs_index_t index);
 
 /*mfs_inode.c*/

uspace/srv/fs/minixfs/mfs_ops.c

@@ -40 +40 @@
 static bool check_magic_number(uint16_t magic, bool *native,
                                 mfs_version_t *version, bool *longfilenames);
+static int mfs_node_core_get(fs_node_t **rfn, struct mfs_instance *inst,
+                        fs_index_t index);
 
 static LIST_INITIALIZE(inst_list);
@@ -47 +49 @@
         .device_get = mfs_device_get,
         .is_directory = mfs_is_directory,
-        .is_file = mfs_is_file
+        .is_file = mfs_is_file,
+        .node_get = mfs_node_get
 };
 
@@ -204 +207 @@
 }
 
+int mfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle,
+                        fs_index_t index)
+{
+        int rc;
+        struct mfs_instance *instance;
+
+        rc = mfs_instance_get(devmap_handle, &instance);
+
+        if (rc != EOK)
+                return rc;
+
+        return mfs_node_core_get(rfn, instance, index);
+}
+
+static int mfs_node_core_get(fs_node_t **rfn, struct mfs_instance *inst,
+                        fs_index_t index)
+{
+        fs_node_t *node = NULL;
+        struct mfs_node *mnode = NULL;
+        int rc;
+
+        const struct mfs_sb_info *sbi = inst->sbi;
+
+        node = (fs_node_t *) malloc(sizeof(fs_node_t));
+        if (!node) {
+                rc = ENOMEM;
+                goto out_err;
+        }
+
+        fs_node_initialize(node);
+
+        mnode = (struct mfs_node *) malloc(sizeof(struct mfs_node));
+        if (!mnode) {
+                rc = ENOMEM;
+                goto out_err;
+        }
+
+        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;
+        } else {
+                /*Read MFS V2/V3 inode*/
+                struct mfs2_inode *ino2;
+
+                ino2 = mfs2_read_inode_raw(inst, index);
+                mnode->ino2 = ino2;
+        }
+
+        mnode->instance = inst;
+        node->data = mnode;
+        *rfn = node;
+
+        return EOK;
+
+out_err:
+        if (node)
+                free(node);
+        if (mnode)
+                free(mnode);
+        return rc;
+}
+
 bool mfs_is_directory(fs_node_t *fsnode)
 {
-        struct mfs_node *node = fsnode->data;
-        struct mfs_sb_info *sbi = node->instance->sbi;
+        const struct mfs_node *node = fsnode->data;
+        const struct mfs_sb_info *sbi = node->instance->sbi;
 
         if (sbi->fs_version == MFS_VERSION_V1)
@@ -229 +297 @@
  * Find a filesystem instance given the devmap handle
  */
-int mfs_get_instance(devmap_handle_t handle, struct mfs_instance **instance)
+int mfs_instance_get(devmap_handle_t handle, struct mfs_instance **instance)
 {
         link_t *link;