Changes in uspace/srv/fs/exfat/exfat_bitmap.c [e738d56:ff0c270] in mainline

File:

• uspace/srv/fs/exfat/exfat_bitmap.c (modified) (13 diffs)

uspace/srv/fs/exfat/exfat_bitmap.c

@@ -45 +45 @@
 #include <assert.h>
 #include <fibril_synch.h>
+#include <malloc.h>
 #include <mem.h>
 
 
-int exfat_bitmap_is_free(exfat_bs_t *bs, service_id_t service_id, 
+int bitmap_is_free(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t clst)
 {
@@ -89 +90 @@
 }
 
-int exfat_bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id, 
+int bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t clst)
 {
@@ -124 +125 @@
 }
 
-int exfat_bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id, 
+int bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t clst)
 {
@@ -160 +161 @@
 }
 
-int exfat_bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id, 
+int bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t firstc, exfat_cluster_t count)
 {
@@ -168 +169 @@
 
         while (clst < firstc + count ) {
-                rc = exfat_bitmap_set_cluster(bs, service_id, clst);
+                rc = bitmap_set_cluster(bs, service_id, clst);
                 if (rc != EOK) {
                         if (clst - firstc > 0)
-                                (void) exfat_bitmap_clear_clusters(bs, service_id,
+                                (void) bitmap_clear_clusters(bs, service_id,
                                     firstc, clst - firstc);
                         return rc;
@@ -180 +181 @@
 }
 
-int exfat_bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id, 
+int bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t firstc, exfat_cluster_t count)
 {
@@ -188 +189 @@
 
         while (clst < firstc + count) {
-                rc = exfat_bitmap_clear_cluster(bs, service_id, clst);
+                rc = bitmap_clear_cluster(bs, service_id, clst);
                 if (rc != EOK)
                         return rc;
@@ -196 +197 @@
 }
 
-int exfat_bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, 
+int bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t *firstc, exfat_cluster_t count)
 {
@@ -204 +205 @@
         while (startc < DATA_CNT(bs) + 2) {
                 endc = startc;
-                while (exfat_bitmap_is_free(bs, service_id, endc) == EOK) {
+                while (bitmap_is_free(bs, service_id, endc) == EOK) {
                         if ((endc - startc) + 1 == count) {
                                 *firstc = startc;
-                                return exfat_bitmap_set_clusters(bs, service_id, startc, count);
+                                return bitmap_set_clusters(bs, service_id, startc, count);
                         } else
                                 endc++;
@@ -217 +218 @@
 
 
-int exfat_bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 
+int bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 
     exfat_cluster_t count)
 {
         if (nodep->firstc == 0) {
-                return exfat_bitmap_alloc_clusters(bs, nodep->idx->service_id, 
+                return bitmap_alloc_clusters(bs, nodep->idx->service_id, 
                     &nodep->firstc, count);
         } else {
@@ -228 +229 @@
 
                 clst = lastc + 1;
-                while (exfat_bitmap_is_free(bs, nodep->idx->service_id, clst) == EOK) {
+                while (bitmap_is_free(bs, nodep->idx->service_id, clst) == EOK) {
                         if (clst - lastc == count){
-                                return exfat_bitmap_set_clusters(bs, nodep->idx->service_id, 
+                                return bitmap_set_clusters(bs, nodep->idx->service_id, 
                                     lastc + 1, count);
                         } else
@@ -240 +241 @@
 
 
-int exfat_bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 
+int bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 
     exfat_cluster_t count)
 {
@@ -247 +248 @@
         lastc -= count;
 
-        return exfat_bitmap_clear_clusters(bs, nodep->idx->service_id, lastc + 1, count);
-}
-
-
-int exfat_bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep)
+        return bitmap_clear_clusters(bs, nodep->idx->service_id, lastc + 1, count);
+}
+
+
+int bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep)
 {
         int rc;