Changeset a9b756e in mainline for uspace/srv/fs/exfat/exfat_fat.c

Timestamp:

2011-08-16T16:30:27Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

ae560da

Parents:

93e12f3

Message:

exFAT: fix exfat_alloc_clusters. Bitmap should have higher priority than FAT

File:

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

uspace/srv/fs/exfat/exfat_fat.c

@@ -38 +38 @@
 
 #include "exfat_fat.h"
+#include "exfat_bitmap.h"
 #include "exfat.h"
 #include "../../vfs/vfs.h"
@@ -301 +302 @@
         exfat_cluster_t *lifo;    /* stack for storing free cluster numbers */
         unsigned found = 0;     /* top of the free cluster number stack */
-        exfat_cluster_t clst, value;
+        exfat_cluster_t clst;
         int rc = EOK;
 
@@ -310 +311 @@
         fibril_mutex_lock(&exfat_alloc_lock);
         for (clst=EXFAT_CLST_FIRST; clst < DATA_CNT(bs)+2 && found < nclsts; clst++) {
-                rc = exfat_get_cluster(bs, devmap_handle, clst, &value);
-                if (rc != EOK)
-                        break;
-
-                if (value == 0) {
+                /* Need to rewrite because of multiple exfat_bitmap_get calls */
+                if (bitmap_is_free(bs, devmap_handle, clst)==EOK) {
                    /*
                         * The cluster is free. Put it into our stack
@@ -324 +322 @@
                         if (rc != EOK)
                                 break;
-
                         found++;
+                        rc = bitmap_set_cluster(bs, devmap_handle, clst);
+                        if (rc != EOK)
+                                break;
+
                 }
         }
@@ -339 +340 @@
         /* If something wrong - free the clusters */
         if (found > 0) {
-                while (found--)
-                        rc = exfat_set_cluster(bs, devmap_handle, lifo[found], 0);
+                while (found--) {
+                        (void) bitmap_clear_cluster(bs, devmap_handle, lifo[found]);
+                        (void) exfat_set_cluster(bs, devmap_handle, lifo[found], 0);
+                }
         }