Changes in uspace/srv/fs/fat/fat_ops.c [b69e4c0:b33870b] in mainline

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -871 +871 @@
     aoff64_t *size, unsigned *linkcnt)
 {
-        enum cache_mode cmode = CACHE_MODE_WB;
+        enum cache_mode cmode;
         fat_bs_t *bs;
-        fat_instance_t *instance;
-        int rc;
-
-        instance = malloc(sizeof(fat_instance_t));
-        if (!instance)
-                return ENOMEM;
-        instance->lfn_enabled = true;
-
-        /* Parse mount options. */
-        char *mntopts = (char *) opts;
-        char *saveptr;
-        char *opt;
-        while ((opt = strtok_r(mntopts, " ,", &saveptr)) != NULL) {
-                if (str_cmp(opt, "wtcache") == 0)
-                        cmode = CACHE_MODE_WT;
-                else if (str_cmp(opt, "nolfn") == 0)
-                        instance->lfn_enabled = false;
-                mntopts = NULL;
-        }
+        int rc;
+
+        /* Check for option enabling write through. */
+        if (str_cmp(opts, "wtcache") == 0)
+                cmode = CACHE_MODE_WT;
+        else
+                cmode = CACHE_MODE_WB;
 
         /* initialize libblock */
         rc = block_init(EXCHANGE_SERIALIZE, service_id, BS_SIZE);
-        if (rc != EOK) {
-                free(instance);
-                return rc;
-        }
+        if (rc != EOK)
+                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;
@@ -912 +897 @@
         
         if (BPS(bs) != BS_SIZE) {
-                free(instance);
                 block_fini(service_id);
                 return ENOTSUP;
@@ -920 +904 @@
         rc = block_cache_init(service_id, BPS(bs), 0 /* XXX */, cmode);
         if (rc != EOK) {
-                free(instance);
                 block_fini(service_id);
                 return rc;
@@ -928 +911 @@
         rc = fat_sanity_check(bs, service_id);
         if (rc != EOK) {
-                free(instance);
                 (void) block_cache_fini(service_id);
                 block_fini(service_id);
@@ -936 +918 @@
         rc = fat_idx_init_by_service_id(service_id);
         if (rc != EOK) {
-                free(instance);
                 (void) block_cache_fini(service_id);
                 block_fini(service_id);
@@ -945 +926 @@
         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);
@@ -955 +935 @@
         fat_node_t *rootp = (fat_node_t *)malloc(sizeof(fat_node_t));
         if (!rootp) {
-                free(instance);
                 free(rfn);
                 (void) block_cache_fini(service_id);
@@ -966 +945 @@
         fat_idx_t *ridxp = fat_idx_get_by_pos(service_id, FAT_CLST_ROOTPAR, 0);
         if (!ridxp) {
-                free(instance);
                 free(rfn);
                 free(rootp);
@@ -986 +964 @@
                 rc = fat_clusters_get(&clusters, bs, service_id, rootp->firstc);
                 if (rc != EOK) {
-                        fibril_mutex_unlock(&ridxp->lock);
-                        free(instance);
                         free(rfn);
                         free(rootp);
@@ -999 +975 @@
                 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;
         ridxp->nodep = rootp;
@@ -1025 +989 @@
 }
 
-static int fat_update_fat32_fsinfo(service_id_t service_id)
-{
-        fat_bs_t *bs;
-        fat32_fsinfo_t *info;
-        block_t *b;
-        int rc;
-
-        bs = block_bb_get(service_id);
-        assert(FAT_IS_FAT32(bs));
-
-        rc = block_get(&b, service_id, uint16_t_le2host(bs->fat32.fsinfo_sec),
-            BLOCK_FLAGS_NONE);
-        if (rc != EOK)
-                return rc;
-
-        info = (fat32_fsinfo_t *) b->data;
-
-        if (bcmp(info->sig1, FAT32_FSINFO_SIG1, sizeof(info->sig1)) ||
-            bcmp(info->sig2, FAT32_FSINFO_SIG2, sizeof(info->sig2)) ||
-            bcmp(info->sig3, FAT32_FSINFO_SIG3, sizeof(info->sig3))) {
-                (void) block_put(b);
-                return EINVAL;
-        }
-
-        /* For now, invalidate the counter. */
-        info->free_clusters = host2uint16_t_le(-1);
-
-        b->dirty = true;
-        return block_put(b);
-}
-
 static int fat_unmounted(service_id_t service_id)
 {
         fs_node_t *fn;
         fat_node_t *nodep;
-        fat_bs_t *bs;
-        int rc;
-
-        bs = block_bb_get(service_id);
+        int rc;
 
         rc = fat_root_get(&fn, service_id);
@@ -1077 +1007 @@
                 (void) fat_node_put(fn);
                 return EBUSY;
-        }
-
-        if (FAT_IS_FAT32(bs)) {
-                /*
-                 * Attempt to update the FAT32 FS info.
-                 */
-                (void) fat_update_fat32_fsinfo(service_id);
         }
 
@@ -1101 +1024 @@
         (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;