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

Timestamp:

2012-05-05T08:12:17Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/fs/exfat/exfat_fat.c

@@ -127 +127 @@
 {
         exfat_cluster_t firstc = nodep->firstc;
-        exfat_cluster_t currc;
+        exfat_cluster_t currc = 0;
         aoff64_t relbn = bn;
         int rc;
@@ -314 +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
@@ -325 +325 @@
                                 goto exit_error;
                         found++;
-                        rc = bitmap_set_cluster(bs, service_id, clst);
+                        rc = exfat_bitmap_set_cluster(bs, service_id, clst);
                         if (rc != EOK)
                                 goto exit_error;
@@ -346 +346 @@
         /* 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);
         }
@@ -378 +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;