Changeset de5b708 in mainline for uspace/lib/ext4/src/ops.c

Timestamp:

2017-05-12T17:15:49Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

395df52

Parents:

be39fc6

Message:

Restructure ext4 filesystem opening/closing.

File:

• uspace/lib/ext4/src/ops.c (modified) (3 diffs)

uspace/lib/ext4/src/ops.c

@@ -928 +928 @@
     fs_index_t *index, aoff64_t *size, unsigned *lnkcnt)
 {
-        /* Allocate libext4 filesystem structure */
-        ext4_filesystem_t *fs = (ext4_filesystem_t *)
-            malloc(sizeof(ext4_filesystem_t));
-        if (fs == NULL)
-                return ENOMEM;
+        ext4_filesystem_t *fs;
         
         /* Allocate instance structure */
         ext4_instance_t *inst = (ext4_instance_t *)
             malloc(sizeof(ext4_instance_t));
-        if (inst == NULL) {
-                free(fs);
+        if (inst == NULL)
                 return ENOMEM;
-        }
         
         enum cache_mode cmode;
@@ -951 +945 @@
         link_initialize(&inst->link);
         inst->service_id = service_id;
-        inst->filesystem = fs;
         inst->open_nodes_count = 0;
         
         /* Initialize the filesystem */
         aoff64_t rnsize;
-        int rc = ext4_filesystem_init(fs, inst, service_id, cmode, &rnsize);
-        if (rc != EOK) {
-                free(fs);
+        int rc = ext4_filesystem_open(inst, service_id, cmode, &rnsize, &fs);
+        if (rc != EOK) {
                 free(inst);
                 return rc;
@@ -1005 +997 @@
         fibril_mutex_unlock(&open_nodes_lock);
         
-        return ext4_filesystem_fini(inst->filesystem);
+        rc = ext4_filesystem_close(inst->filesystem);
+        if (rc != EOK) {
+                fibril_mutex_lock(&instance_list_mutex);
+                list_append(&inst->link, &instance_list);
+                fibril_mutex_unlock(&instance_list_mutex);
+        }
+
+        free(inst);
+        return EOK;
 }