Changeset 98cb0495 in mainline for uspace/srv/fs/exfat/exfat_bitmap.c

Timestamp:

2012-03-04T18:52:28Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

38b950f

Parents:

6561a8e (diff), 0499235 (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_bitmap.c (modified) (13 diffs)

uspace/srv/fs/exfat/exfat_bitmap.c

@@ -48 +48 @@
 
 
-int bitmap_is_free(exfat_bs_t *bs, service_id_t service_id, 
+int exfat_bitmap_is_free(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t clst)
 {
@@ -89 +89 @@
 }
 
-int bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id, 
+int exfat_bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t clst)
 {
@@ -124 +124 @@
 }
 
-int bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id, 
+int exfat_bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t clst)
 {
@@ -160 +160 @@
 }
 
-int bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id, 
+int exfat_bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t firstc, exfat_cluster_t count)
 {
@@ -168 +168 @@
 
         while (clst < firstc + count ) {
-                rc = bitmap_set_cluster(bs, service_id, clst);
+                rc = exfat_bitmap_set_cluster(bs, service_id, clst);
                 if (rc != EOK) {
                         if (clst - firstc > 0)
-                                (void) bitmap_clear_clusters(bs, service_id,
+                                (void) exfat_bitmap_clear_clusters(bs, service_id,
                                     firstc, clst - firstc);
                         return rc;
@@ -180 +180 @@
 }
 
-int bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id, 
+int exfat_bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t firstc, exfat_cluster_t count)
 {
@@ -188 +188 @@
 
         while (clst < firstc + count) {
-                rc = bitmap_clear_cluster(bs, service_id, clst);
+                rc = exfat_bitmap_clear_cluster(bs, service_id, clst);
                 if (rc != EOK)
                         return rc;
@@ -196 +196 @@
 }
 
-int bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, 
+int exfat_bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, 
     exfat_cluster_t *firstc, exfat_cluster_t count)
 {
@@ -204 +204 @@
         while (startc < DATA_CNT(bs) + 2) {
                 endc = startc;
-                while (bitmap_is_free(bs, service_id, endc) == EOK) {
+                while (exfat_bitmap_is_free(bs, service_id, endc) == EOK) {
                         if ((endc - startc) + 1 == count) {
                                 *firstc = startc;
-                                return bitmap_set_clusters(bs, service_id, startc, count);
+                                return exfat_bitmap_set_clusters(bs, service_id, startc, count);
                         } else
                                 endc++;
@@ -217 +217 @@
 
 
-int bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 
+int exfat_bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 
     exfat_cluster_t count)
 {
         if (nodep->firstc == 0) {
-                return bitmap_alloc_clusters(bs, nodep->idx->service_id, 
+                return exfat_bitmap_alloc_clusters(bs, nodep->idx->service_id, 
                     &nodep->firstc, count);
         } else {
@@ -228 +228 @@
 
                 clst = lastc + 1;
-                while (bitmap_is_free(bs, nodep->idx->service_id, clst) == EOK) {
+                while (exfat_bitmap_is_free(bs, nodep->idx->service_id, clst) == EOK) {
                         if (clst - lastc == count){
-                                return bitmap_set_clusters(bs, nodep->idx->service_id, 
+                                return exfat_bitmap_set_clusters(bs, nodep->idx->service_id, 
                                     lastc + 1, count);
                         } else
@@ -240 +240 @@
 
 
-int bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 
+int exfat_bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 
     exfat_cluster_t count)
 {
@@ -247 +247 @@
         lastc -= count;
 
-        return bitmap_clear_clusters(bs, nodep->idx->service_id, lastc + 1, count);
-}
-
-
-int bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep)
+        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)
 {
         int rc;