Changeset 32f623d9 in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2011-09-24T20:49:11Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

40cdbec

Parents:

5bf76c1

Message:

Make FAT use instance data.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (12 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -873 +873 @@
         enum cache_mode cmode;
         fat_bs_t *bs;
-        int rc;
+        fat_instance_t *instance;
+        int rc;
+
+        instance = malloc(sizeof(fat_instance_t));
+        if (!instance)
+                return ENOMEM;
+
+        instance->lfn_enabled = true;
 
         /* Check for option enabling write through. */
@@ -883 +890 @@
         /* initialize libblock */
         rc = block_init(EXCHANGE_SERIALIZE, service_id, BS_SIZE);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                free(instance);
+                return rc;
+        }
 
         /* prepare the boot block */
         rc = block_bb_read(service_id, BS_BLOCK);
         if (rc != EOK) {
+                free(instance);
                 block_fini(service_id);
                 return rc;
@@ -897 +907 @@
         
         if (BPS(bs) != BS_SIZE) {
+                free(instance);
                 block_fini(service_id);
                 return ENOTSUP;
@@ -904 +915 @@
         rc = block_cache_init(service_id, BPS(bs), 0 /* XXX */, cmode);
         if (rc != EOK) {
+                free(instance);
                 block_fini(service_id);
                 return rc;
@@ -911 +923 @@
         rc = fat_sanity_check(bs, service_id);
         if (rc != EOK) {
+                free(instance);
                 (void) block_cache_fini(service_id);
                 block_fini(service_id);
@@ -918 +931 @@
         rc = fat_idx_init_by_service_id(service_id);
         if (rc != EOK) {
+                free(instance);
                 (void) block_cache_fini(service_id);
                 block_fini(service_id);
@@ -926 +940 @@
         fs_node_t *rfn = (fs_node_t *)malloc(sizeof(fs_node_t));
         if (!rfn) {
+                free(instance);
                 (void) block_cache_fini(service_id);
                 block_fini(service_id);
@@ -935 +950 @@
         fat_node_t *rootp = (fat_node_t *)malloc(sizeof(fat_node_t));
         if (!rootp) {
+                free(instance);
                 free(rfn);
                 (void) block_cache_fini(service_id);
@@ -945 +961 @@
         fat_idx_t *ridxp = fat_idx_get_by_pos(service_id, FAT_CLST_ROOTPAR, 0);
         if (!ridxp) {
+                free(instance);
                 free(rfn);
                 free(rootp);
@@ -964 +981 @@
                 rc = fat_clusters_get(&clusters, bs, service_id, rootp->firstc);
                 if (rc != EOK) {
+                        fibril_mutex_unlock(&ridxp->lock);
+                        free(instance);
                         free(rfn);
                         free(rootp);
@@ -974 +993 @@
         } else
                 rootp->size = RDE(bs) * sizeof(fat_dentry_t);
+
+        rc = fs_instance_create(service_id, instance);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&ridxp->lock);
+                free(instance);
+                free(rfn);
+                free(rootp);
+                (void) block_cache_fini(service_id);
+                block_fini(service_id);
+                fat_idx_fini_by_service_id(service_id);
+                return rc;
+        }
 
         rootp->idx = ridxp;
@@ -1024 +1055 @@
         (void) block_cache_fini(service_id);
         block_fini(service_id);
+
+        void *data;
+        if (fs_instance_get(service_id, &data) == EOK) {
+                fs_instance_destroy(service_id);
+                free(data);
+        }
 
         return EOK;