Changeset 1db44ea7 in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2011-09-25T18:46:45Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

36cb22f

Parents:

dcc44ca1 (diff), f9d8c3a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/fs/mfs/mfs_ops.c (modified) (5 diffs)

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);
@@ -178 +176 @@
                 goto out_error;
         }
-
-        instance->open_nodes_cnt = 0;
 
         sb = malloc(MFS_SUPERBLOCK_SIZE);
@@ -271 +267 @@
         }
 
-        /*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");
@@ -323 +324 @@
         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);
@@ -1020 +1018 @@
 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;
 }