Changeset 25c60f4 in mainline

Timestamp:

2011-08-14T09:32:44Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

f061de75

Parents:

5d5863c

Message:

exFAT: implement bitmap_is_free, bitmap_clear_cluster

Location:

uspace/srv/fs/exfat

Files:

• exfat_bitmap.c (modified) (5 diffs)
• exfat_bitmap.h (modified) (1 diff)

uspace/srv/fs/exfat/exfat_bitmap.c

@@ -52 +52 @@
     exfat_cluster_t clst)
 {
-        /* TODO */
-        return EOK;
-}
-
-int bitmap_set_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, 
-    exfat_cluster_t firstc)
-{
         fs_node_t *fn;
         block_t *b=NULL;
@@ -64 +57 @@
         uint8_t *bitmap;
         int rc;
-
-        firstc -= EXFAT_CLST_FIRST;
-        
-        /* rc = exfat_node_get(&fn, devmap_handle, EXFAT_BITMAP_IDX); */
+        bool alloc;
+
+        clst -= EXFAT_CLST_FIRST;
+        
         rc = exfat_bitmap_get(&fn, devmap_handle);
         if (rc != EOK)
@@ -73 +66 @@
         bitmapp = EXFAT_NODE(fn);
         
-        aoff64_t offset = firstc / 8;
+        aoff64_t offset = clst / 8;
         rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), BLOCK_FLAGS_NONE);
         if (rc != EOK) {
@@ -80 +73 @@
         }
         bitmap = (uint8_t *)b->data;
-        bitmap[offset % BPS(bs)] |= (1 << (firstc % 8));
+        alloc = bitmap[offset % BPS(bs)] & (1 << (clst % 8));
+
+        rc = block_put(b);
+        if (rc != EOK) {
+                (void) exfat_node_put(fn);
+                return rc;
+        }
+        rc = exfat_node_put(fn);
+        if (rc != EOK)
+                return rc;
+
+        if (alloc)
+                return ENOENT;
+
+        return EOK;
+}
+
+int bitmap_set_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, 
+    exfat_cluster_t clst)
+{
+        fs_node_t *fn;
+        block_t *b=NULL;
+        exfat_node_t *bitmapp;
+        uint8_t *bitmap;
+        int rc;
+
+        clst -= EXFAT_CLST_FIRST;
+        
+        rc = exfat_bitmap_get(&fn, devmap_handle);
+        if (rc != EOK)
+                return rc;
+        bitmapp = EXFAT_NODE(fn);
+        
+        aoff64_t offset = clst / 8;
+        rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), BLOCK_FLAGS_NONE);
+        if (rc != EOK) {
+                (void) exfat_node_put(fn);
+                return rc;
+        }
+        bitmap = (uint8_t *)b->data;
+        bitmap[offset % BPS(bs)] |= (1 << (clst % 8));
 
         b->dirty = true;
@@ -93 +126 @@
 
 int bitmap_clear_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, 
-    exfat_cluster_t firstc)
-{
-        /* TODO */
-        return EOK;
+    exfat_cluster_t clst)
+{
+        fs_node_t *fn;
+        block_t *b=NULL;
+        exfat_node_t *bitmapp;
+        uint8_t *bitmap;
+        int rc;
+
+        clst -= EXFAT_CLST_FIRST;
+        
+        rc = exfat_bitmap_get(&fn, devmap_handle);
+        if (rc != EOK)
+                return rc;
+        bitmapp = EXFAT_NODE(fn);
+        
+        aoff64_t offset = clst / 8;
+        rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), BLOCK_FLAGS_NONE);
+        if (rc != EOK) {
+                (void) exfat_node_put(fn);
+                return rc;
+        }
+        bitmap = (uint8_t *)b->data;
+        bitmap[offset % BPS(bs)] &= ~(1 << (clst % 8));
+
+        b->dirty = true;
+        rc = block_put(b);
+        if (rc != EOK) {
+                (void) exfat_node_put(fn);
+                return rc;
+        }
+        
+        return exfat_node_put(fn);
 }
 

uspace/srv/fs/exfat/exfat_bitmap.h

@@ -53 +53 @@
     exfat_cluster_t clst);
 extern int bitmap_set_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, 
-    exfat_cluster_t firstc);
+    exfat_cluster_t clst);
 extern int bitmap_clear_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, 
-    exfat_cluster_t firstc);
+    exfat_cluster_t clst);
+
 extern int bitmap_set_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, 
     exfat_cluster_t firstc, exfat_cluster_t count);