Changeset 5bf76c1 in mainline

Timestamp:

2011-09-24T16:15:41Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32f623d9

Parents:

925a21e

Message:

Move the fs instance managing logic out of mfs to libfs.

Location:

uspace

Files:

• lib/fs/libfs.c (modified) (1 diff)
• lib/fs/libfs.h (modified) (1 diff)
• srv/fs/mfs/mfs.h (modified) (1 diff)
• srv/fs/mfs/mfs_ops.c (modified) (6 diffs)

uspace/lib/fs/libfs.c

@@ -877 +877 @@
 }
 
+static FIBRIL_MUTEX_INITIALIZE(instances_mutex);
+static LIST_INITIALIZE(instances_list);
+
+typedef struct {
+        service_id_t service_id;
+        link_t link;
+        void *data;
+} fs_instance_t;
+
+int fs_instance_create(service_id_t service_id, void *data)
+{
+        fs_instance_t *inst = malloc(sizeof(fs_instance_t));
+        if (!inst)
+                return ENOMEM;
+
+        link_initialize(&inst->link);
+        inst->service_id = service_id;
+        inst->data = data;
+
+        fibril_mutex_lock(&instances_mutex);
+        list_foreach(instances_list, link) {
+                fs_instance_t *cur = list_get_instance(link, fs_instance_t,
+                    link);
+
+                if (cur->service_id == service_id) {
+                        fibril_mutex_unlock(&instances_mutex);
+                        free(inst);
+                        return EEXIST;
+                }
+
+                /* keep the list sorted */
+                if (cur->service_id < service_id) {
+                        list_insert_before(&inst->link, &cur->link);
+                        fibril_mutex_unlock(&instances_mutex);
+                        return EOK;
+                }
+        }
+        list_append(&inst->link, &instances_list);
+        fibril_mutex_unlock(&instances_mutex);
+
+        return EOK;
+}
+
+int fs_instance_get(service_id_t service_id, void **idp)
+{
+        fibril_mutex_lock(&instances_mutex);
+        list_foreach(instances_list, link) {
+                fs_instance_t *inst = list_get_instance(link, fs_instance_t,
+                    link);
+
+                if (inst->service_id == service_id) {
+                        *idp = inst->data;
+                        fibril_mutex_unlock(&instances_mutex);
+                        return EOK;
+                }
+        }
+        fibril_mutex_unlock(&instances_mutex);
+        return ENOENT;
+}
+
+int fs_instance_destroy(service_id_t service_id)
+{
+        fibril_mutex_lock(&instances_mutex);
+        list_foreach(instances_list, link) {
+                fs_instance_t *inst = list_get_instance(link, fs_instance_t,
+                    link);
+
+                if (inst->service_id == service_id) {
+                        list_remove(&inst->link);
+                        fibril_mutex_unlock(&instances_mutex);
+                        free(inst);
+                        return EOK;
+                }
+        }
+        fibril_mutex_unlock(&instances_mutex);
+        return ENOENT;
+}
+
 /** @}
  */

uspace/lib/fs/libfs.h

@@ -105 +105 @@
 extern void fs_node_initialize(fs_node_t *);
 
+extern int fs_instance_create(service_id_t, void *);
+extern int fs_instance_get(service_id_t, void **);
+extern int fs_instance_destroy(service_id_t);
+
 #endif
 

uspace/srv/fs/mfs/mfs.h

@@ -131 +131 @@
 
 struct mfs_instance {
-        link_t link;
         service_id_t service_id;
         struct mfs_sb_info *sbi;

uspace/srv/fs/mfs/mfs_ops.c

@@ -73 +73 @@
 
 
-static LIST_INITIALIZE(inst_list);
-static FIBRIL_MUTEX_INITIALIZE(inst_list_mutex);
 static hash_table_t open_nodes;
 static FIBRIL_MUTEX_INITIALIZE(open_nodes_lock);
@@ -179 +177 @@
                 return ENOMEM;
         }
-
-        instance->open_nodes_cnt = 0;
 
         sb = malloc(MFS_SUPERBLOCK_SIZE);
@@ -268 +264 @@
                 free(instance);
                 free(sbi);
-                free(sb);
                 block_cache_fini(service_id);
                 block_fini(service_id);
@@ -275 +270 @@
         }
 
-        /*Initialize the instance structure and add it to the list*/
-        link_initialize(&instance->link);
+        /*Initialize the instance structure and remember it*/
         instance->service_id = service_id;
         instance->sbi = sbi;
-
-        fibril_mutex_lock(&inst_list_mutex);
-        list_append(&instance->link, &inst_list);
-        fibril_mutex_unlock(&inst_list_mutex);
+        instance->open_nodes_cnt = 0;
+        rc = fs_instance_create(service_id, instance);
+        if (rc != EOK) {
+                free(instance);
+                free(sbi);
+                block_cache_fini(service_id);
+                block_fini(service_id);
+                mfsdebug("fs instance creation failed\n");
+                return rc;
+        }
 
         mfsdebug("mount successful\n");
@@ -315 +315 @@
         block_fini(service_id);
 
-        /* Remove the instance from the list */
-        fibril_mutex_lock(&inst_list_mutex);
-        list_remove(&inst->link);
-        fibril_mutex_unlock(&inst_list_mutex);
-
+        /* Remove and destroy the instance */
+        (void) fs_instance_destroy(service_id);
         free(inst->sbi);
         free(inst);
@@ -1012 +1009 @@
 mfs_instance_get(service_id_t service_id, struct mfs_instance **instance)
 {
-        struct mfs_instance *instance_ptr;
-
-        fibril_mutex_lock(&inst_list_mutex);
-
-        if (list_empty(&inst_list)) {
-                fibril_mutex_unlock(&inst_list_mutex);
-                return EINVAL;
-        }
-
-        list_foreach(inst_list, link) {
-                instance_ptr = list_get_instance(link, struct mfs_instance,
-                                                 link);
-
-                if (instance_ptr->service_id == service_id) {
-                        *instance = instance_ptr;
-                        fibril_mutex_unlock(&inst_list_mutex);
-                        return EOK;
-                }
-        }
-
-        mfsdebug("Instance not found\n");
-
-        fibril_mutex_unlock(&inst_list_mutex);
-        return EINVAL;
+        void *data;
+        int rc;
+
+        rc = fs_instance_get(service_id, &data);
+        if (rc == EOK) {
+                *instance = (struct mfs_instance *) data;
+        } else {
+                mfsdebug("instance not found\n");
+        }
+
+        return rc;
 }