Changes in uspace/srv/fs/mfs/mfs_ops.c [5bf76c1:7a46bfe] in mainline

File:

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

uspace/srv/fs/mfs/mfs_ops.c

@@ -55 +55 @@
 static int mfs_has_children(bool *has_children, fs_node_t *fsnode);
 static int mfs_root_get(fs_node_t **rfn, service_id_t service_id);
-static service_id_t mfs_service_get(fs_node_t *fsnode);
+static service_id_t mfs_device_get(fs_node_t *fsnode);
 static aoff64_t mfs_size_get(fs_node_t *node);
 static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component);
@@ -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);
@@ -79 +81 @@
         .size_get = mfs_size_get,
         .root_get = mfs_root_get,
-        .service_get = mfs_service_get,
+        .device_get = mfs_device_get,
         .is_directory = mfs_is_directory,
         .is_file = mfs_is_file,
@@ -177 +179 @@
                 return ENOMEM;
         }
+
+        instance->open_nodes_cnt = 0;
 
         sb = malloc(MFS_SUPERBLOCK_SIZE);
@@ -264 +268 @@
                 free(instance);
                 free(sbi);
+                free(sb);
                 block_cache_fini(service_id);
                 block_fini(service_id);
@@ -270 +275 @@
         }
 
-        /*Initialize the instance structure and remember it*/
+        /*Initialize the instance structure and add it to the list*/
+        link_initialize(&instance->link);
         instance->service_id = service_id;
         instance->sbi = sbi;
-        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;
-        }
+
+        fibril_mutex_lock(&inst_list_mutex);
+        list_append(&instance->link, &inst_list);
+        fibril_mutex_unlock(&inst_list_mutex);
 
         mfsdebug("mount successful\n");
@@ -315 +315 @@
         block_fini(service_id);
 
-        /* Remove and destroy the instance */
-        (void) fs_instance_destroy(service_id);
+        /* Remove the instance from the list */
+        fibril_mutex_lock(&inst_list_mutex);
+        list_remove(&inst->link);
+        fibril_mutex_unlock(&inst_list_mutex);
+
         free(inst->sbi);
         free(inst);
@@ -322 +325 @@
 }
 
-service_id_t mfs_service_get(fs_node_t *fsnode)
+service_id_t mfs_device_get(fs_node_t *fsnode)
 {
         struct mfs_node *node = fsnode->data;
@@ -465 +468 @@
 static aoff64_t mfs_size_get(fs_node_t *node)
 {
+        assert(node);
+
         const struct mfs_node *mnode = node->data;
+        assert(mnode);
+        assert(mnode->ino_i);
+
         return mnode->ino_i->i_size;
 }
@@ -505 +513 @@
                 assert(mnode->instance->open_nodes_cnt > 0);
                 mnode->instance->open_nodes_cnt--;
-                rc = mfs_put_inode(mnode);
+                rc = mfs_put_inode_core(mnode);
                 free(mnode->ino_i);
                 free(mnode);
@@ -527 +535 @@
 {
         struct mfs_node *mnode = fsnode->data;
+
+        assert(mnode->ino_i);
         return mnode->ino_i->index;
 }
@@ -1009 +1019 @@
 mfs_instance_get(service_id_t service_id, struct mfs_instance **instance)
 {
-        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;
+        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;
 }