Changeset 3b08178 in mainline

Timestamp:

2011-03-17T15:22:22Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e54ba607

Parents:

953a823

Message:

Initialize block cache and add a function to get a filesystem instance given the device handle

Location:

uspace/srv/fs/minixfs

Files:

• mfs.c (modified) (4 diffs)
• mfs.h (modified) (3 diffs)
• mfs_ops.c (modified) (6 diffs)

uspace/srv/fs/minixfs/mfs.c

@@ -38 +38 @@
  */
 
+#define _MAIN
+
 #include <ipc/services.h>
 #include <ipc/ns.h>
@@ -45 +47 @@
 #include <task.h>
 #include <stdio.h>
-#include <libfs.h>
 #include "mfs.h"
 
@@ -55 +56 @@
         .write_retains_size = false,    
 };
-
-fs_reg_t mfs_reg;
-
 
 
@@ -104 +102 @@
                         break;
                 case VFS_OUT_MOUNT:
-                        mfsdebug("Mounting...\n");
+                        mfs_mount(callid, &call);
                         break;
                 default:

uspace/srv/fs/minixfs/mfs.h

@@ -36 +36 @@
 #include <minix.h>
 #include <libblock.h>
+#include <libfs.h>
 #include <adt/list.h>
 #include "../../vfs/vfs.h"
@@ -46 +47 @@
 #define mfsdebug(...)
 #endif
+
+#ifdef _MAIN
+#define GLOBAL
+#else
+#define GLOBAL extern
+#endif
+
+GLOBAL fs_reg_t mfs_reg;
 
 typedef enum {
@@ -80 +89 @@
 
 extern void mfs_mounted(ipc_callid_t rid, ipc_call_t *request);
+extern void mfs_mount(ipc_callid_t rid, ipc_call_t *request);
+extern int  mfs_get_instance(devmap_handle_t handle,
+                                struct mfs_instance **instance);
 
 #endif

uspace/srv/fs/minixfs/mfs_ops.c

@@ -31 +31 @@
  */
 
-#include <libfs.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libblock.h>
 #include <fibril_synch.h>
 #include <errno.h>
-#include <adt/list.h>
 #include "mfs.h"
 #include "mfs_utils.h"
@@ -47 +44 @@
 static LIST_INITIALIZE(inst_list);
 static FIBRIL_MUTEX_INITIALIZE(inst_list_mutex);
+
+libfs_ops_t mfs_libfs_ops;
 
 void mfs_mounted(ipc_callid_t rid, ipc_call_t *request)
@@ -161 +160 @@
                 sbi->max_file_size = conv32(native, sb->s_max_file_size);
                 sbi->nzones = conv16(native, sb->s_nzones);
+                sbi->block_size = MFS_BLOCKSIZE;
                 if (version == MFS_VERSION_V2)
                         sbi->nzones = conv32(native, sb->s_nzones2);
@@ -166 +166 @@
  
         free(sb);
+
+        rc = block_cache_init(devmap_handle, sbi->block_size, 0, CACHE_MODE_WT);
+
+        if (rc != EOK) {
+                block_fini(devmap_handle);
+                async_answer_0(rid, EINVAL);
+                mfsdebug("block cache initialization failed\n");
+                return;
+        }
 
         /*Initialize the instance structure and add it to the list*/
@@ -181 +190 @@
 }
 
+void mfs_mount(ipc_callid_t rid, ipc_call_t *request)
+{
+        libfs_mount(&mfs_libfs_ops, mfs_reg.fs_handle, rid, request);
+}
+
+/*
+ * Find a filesystem instance given the devmap handle
+ */
+int mfs_get_instance(devmap_handle_t handle, struct mfs_instance **instance)
+{
+        link_t *link;
+        struct mfs_instance *instance_ptr;
+
+        fibril_mutex_lock(&inst_list_mutex);
+
+        for (link = inst_list.next; link != &inst_list; link = link->next) {
+                instance_ptr = list_get_instance(link, struct mfs_instance, link);
+                
+                if (instance_ptr->handle == handle) {
+                        *instance = instance_ptr;
+                        fibril_mutex_unlock(&inst_list_mutex);
+                        return EOK;
+                }
+        }
+
+        mfsdebug("Instance not found\n");
+
+        fibril_mutex_unlock(&inst_list_mutex);
+        return EINVAL;
+}
+
 static bool check_magic_number(uint16_t magic, bool *native,
                                 mfs_version_t *version, bool *longfilenames)
@@ -213 +253 @@
 }
 
-
 /**
  * @}