Changeset 953a823 in mainline

Timestamp:

2011-03-17T13:41:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3b08178

Parents:

f66d903

Message:

mount minix filesystem and add the superblock info structure to the instances list

Location:

uspace/srv/fs/minixfs

Files:

• Makefile (modified) (1 diff)
• mfs.h (modified) (2 diffs)
• mfs_ops.c (moved) (moved from uspace/srv/fs/minixfs/mfs_super.c ) (6 diffs)

uspace/srv/fs/minixfs/Makefile

@@ -35 +35 @@
 SOURCES = \
         mfs.c \
-        mfs_super.c \
+        mfs_ops.c \
         mfs_utils.c
 

uspace/srv/fs/minixfs/mfs.h

@@ -35 +35 @@
 
 #include <minix.h>
+#include <libblock.h>
+#include <adt/list.h>
 #include "../../vfs/vfs.h"
 
@@ -47 +49 @@
 typedef enum {
         MFS_VERSION_V1 = 1,
-        MFS_VERSION_V1L,
         MFS_VERSION_V2,
-        MFS_VERSION_V2L,
         MFS_VERSION_V3
 } mfs_version_t;
+
+/*Generic MinixFS superblock*/
+struct mfs_sb_info {
+        uint32_t ninodes;
+        uint32_t nzones;
+        unsigned long ibmap_blocks;
+        unsigned long zbmap_blocks;
+        unsigned long firstdatazone;
+        unsigned long itable_size;
+        int log2_zone_size;
+        int ino_per_block;
+        int dirsize;
+        int block_size;
+        int fs_version;
+        uint32_t max_file_size;
+        uint16_t magic;
+        uint16_t state;
+        bool long_names;
+        bool native;
+};
+
+struct mfs_instance {
+        link_t link;
+        devmap_handle_t handle;
+        struct mfs_sb_info *sbi;
+};
 
 extern void mfs_mounted(ipc_callid_t rid, ipc_call_t *request);

uspace/srv/fs/minixfs/mfs_ops.c

@@ -35 +35 @@
 #include <stdlib.h>
 #include <libblock.h>
+#include <fibril_synch.h>
 #include <errno.h>
-#include <str.h>
+#include <adt/list.h>
 #include "mfs.h"
 #include "mfs_utils.h"
@@ -43 +44 @@
 static bool check_magic_number(uint16_t magic, bool *native,
                                 mfs_version_t *version, bool *longfilenames);
+
+static LIST_INITIALIZE(inst_list);
+static FIBRIL_MUTEX_INITIALIZE(inst_list_mutex);
 
 void mfs_mounted(ipc_callid_t rid, ipc_call_t *request)
@@ -48 +52 @@
         devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         enum cache_mode cmode;  
-        struct mfs_superblock *sp;
-        struct mfs3_superblock *sp3;
+        struct mfs_superblock *sb;
+        struct mfs3_superblock *sb3;
+        struct mfs_sb_info *sbi;
+        struct mfs_instance *instance;
         bool native, longnames;
         mfs_version_t version;
@@ -80 +86 @@
         }
 
-        sp = (struct mfs_superblock *) malloc(MFS_SUPERBLOCK_SIZE);
+        /*Allocate space for generic MFS superblock*/
+        sbi = (struct mfs_sb_info *) malloc(sizeof(struct mfs_sb_info));
+
+        if (!sbi) {
+                async_answer_0(rid, ENOMEM);
+                return;
+        }
+
+        /*Allocate space for filesystem instance*/
+        instance = (struct mfs_instance *) malloc(sizeof(struct mfs_instance));
+
+        if (!instance) {
+                async_answer_0(rid, ENOMEM);
+                return;
+        }
+
+        sb = (struct mfs_superblock *) malloc(MFS_SUPERBLOCK_SIZE);
+
+        if (!sb) {
+                async_answer_0(rid, ENOMEM);
+                return;
+        }
 
         /* Read the superblock */
-        rc = block_read_direct(devmap_handle, MFS_SUPERBLOCK << 1, 1, sp);
+        rc = block_read_direct(devmap_handle, MFS_SUPERBLOCK << 1, 1, sb);
         if (rc != EOK) {
                 block_fini(devmap_handle);
@@ -90 +117 @@
         }
 
-        if (check_magic_number(sp->s_magic, &native, &version, &longnames)) {
-                magic = sp->s_magic;
+        sb3 = (struct mfs3_superblock *) sb;
+
+        if (check_magic_number(sb->s_magic, &native, &version, &longnames)) {
+                magic = sb->s_magic;
                 goto recognized;
         }
 
-        sp3 = (struct mfs3_superblock *) sp;
-
-        if (!check_magic_number(sp3->s_magic, &native, &version, &longnames)) {
+        if (!check_magic_number(sb3->s_magic, &native, &version, &longnames)) {
                 mfsdebug("magic number not recognized\n");
                 block_fini(devmap_handle);
@@ -104 +131 @@
         }
 
-        magic = sp3->s_magic;
+        magic = sb3->s_magic;
 
 recognized:
 
         mfsdebug("magic number recognized = %04x\n", magic);
-        free(sp);
+
+        /*Fill superblock info structure*/
+
+        sbi->fs_version = version;
+        sbi->long_names = longnames;
+        sbi->native = native;
+        sbi->magic = magic;
+
+        if (version == MFS_VERSION_V3) {
+                sbi->ninodes = conv32(native, sb3->s_ninodes);
+                sbi->ibmap_blocks = conv16(native, sb3->s_ibmap_blocks);
+                sbi->zbmap_blocks = conv16(native, sb3->s_zbmap_blocks);
+                sbi->firstdatazone = conv16(native, sb3->s_first_data_zone);
+                sbi->log2_zone_size = conv16(native, sb3->s_log2_zone_size);
+                sbi->max_file_size = conv32(native, sb3->s_max_file_size);
+                sbi->nzones = conv32(native, sb3->s_nzones);
+                sbi->block_size = conv16(native, sb3->s_block_size);
+        } else {
+                sbi->ninodes = conv16(native, sb->s_ninodes);
+                sbi->ibmap_blocks = conv16(native, sb->s_ibmap_blocks);
+                sbi->zbmap_blocks = conv16(native, sb->s_zbmap_blocks);
+                sbi->firstdatazone = conv16(native, sb->s_first_data_zone);
+                sbi->log2_zone_size = conv16(native, sb->s_log2_zone_size);
+                sbi->max_file_size = conv32(native, sb->s_max_file_size);
+                sbi->nzones = conv16(native, sb->s_nzones);
+                if (version == MFS_VERSION_V2)
+                        sbi->nzones = conv32(native, sb->s_nzones2);
+        }
+ 
+        free(sb);
+
+        /*Initialize the instance structure and add it to the list*/
+        link_initialize(&instance->link);
+        instance->handle = devmap_handle;
+        instance->sbi = sbi;
+
+        fibril_mutex_lock(&inst_list_mutex);
+        list_append(&instance->link, &inst_list);
+        fibril_mutex_unlock(&inst_list_mutex);
+
+        mfsdebug("mount successful\n");
+
+        async_answer_0(rid, EOK);
 }