Changes in uspace/srv/fs/exfat/exfat_fat.c [0dbe5ac:aaa77ba0] in mainline

File:

• uspace/srv/fs/exfat/exfat_fat.c (modified) (8 diffs)

uspace/srv/fs/exfat/exfat_fat.c

@@ -50 +50 @@
 #include <malloc.h>
 #include <mem.h>
+#include <str.h>
 
 
@@ -126 +127 @@
 {
         exfat_cluster_t firstc = nodep->firstc;
-        exfat_cluster_t currc;
+        exfat_cluster_t currc = 0;
         aoff64_t relbn = bn;
         int rc;
@@ -313 +314 @@
             clst++) {
                 /* Need to rewrite because of multiple exfat_bitmap_get calls */
-                if (bitmap_is_free(bs, service_id, clst) == EOK) {
+                if (exfat_bitmap_is_free(bs, service_id, clst) == EOK) {
                         /*
                          * The cluster is free. Put it into our stack
@@ -322 +323 @@
                             (found == 0) ?  EXFAT_CLST_EOF : lifo[found - 1]);
                         if (rc != EOK)
-                                break;
+                                goto exit_error;
                         found++;
-                        rc = bitmap_set_cluster(bs, service_id, clst);
+                        rc = exfat_bitmap_set_cluster(bs, service_id, clst);
                         if (rc != EOK)
-                                break;
+                                goto exit_error;
 
                 }
@@ -339 +340 @@
         }
 
+        rc = ENOSPC;
+
+exit_error:
+
         /* If something wrong - free the clusters */
         while (found--) {
-                (void) bitmap_clear_cluster(bs, service_id, lifo[found]);
+                (void) exfat_bitmap_clear_cluster(bs, service_id, lifo[found]);
                 (void) exfat_set_cluster(bs, service_id, lifo[found], 0);
         }
@@ -347 +352 @@
         free(lifo);
         fibril_mutex_unlock(&exfat_alloc_lock);
-        return ENOSPC;
+        return rc;
 }
 
@@ -373 +378 @@
                 if (rc != EOK)
                         return rc;
-                rc = bitmap_clear_cluster(bs, service_id, firstc);
+                rc = exfat_bitmap_clear_cluster(bs, service_id, firstc);
                 if (rc != EOK)
                         return rc;
@@ -537 +542 @@
 int exfat_sanity_check(exfat_bs_t *bs, service_id_t service_id)
 {
-        /* TODO */
+        if (str_cmp((char const *)bs->oem_name, "EXFAT   "))
+                return ENOTSUP;
+        else if (uint16_t_le2host(bs->signature) != 0xAA55)
+                return ENOTSUP;
+        else if (uint32_t_le2host(bs->fat_sector_count) == 0)
+                return ENOTSUP;
+        else if (uint32_t_le2host(bs->data_clusters) == 0)
+                return ENOTSUP;
+        else if (bs->fat_count != 1)
+                return ENOTSUP;
+        else if ((bs->bytes_per_sector + bs->sec_per_cluster) > 25) {
+                /* exFAT does not support cluster size > 32 Mb */
+                return ENOTSUP;
+        }
         return EOK;
 }