Changeset f061de75 in mainline

Timestamp:

2011-08-14T17:24:52Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

cd860fc

Parents:

25c60f4

Message:

exFAT: add exfat_directory_open_parent for managing parent directory
without node pointer

Location:

uspace/srv/fs/exfat

Files:

• exfat_directory.c (modified) (3 diffs)
• exfat_directory.h (modified) (4 diffs)
• exfat_ops.c (modified) (6 diffs)

uspace/srv/fs/exfat/exfat_directory.c

@@ -54 +54 @@
         di->bnum = 0;
         di->last = false;
+        di->fragmented = false;
+        di->firstc = 0;
 }
 
@@ -62 +64 @@
         if (di->nodep->type != EXFAT_DIRECTORY)
                 return EINVAL;
-
-        di->bs = block_bb_get(di->nodep->idx->devmap_handle);
-        di->blocks = di->nodep->size / BPS(di->bs);
+        di->devmap_handle = nodep->idx->devmap_handle;
+        di->fragmented = nodep->fragmented;
+        di->firstc = nodep->firstc;
+
+        di->bs = block_bb_get(di->devmap_handle);
+        di->blocks = nodep->size / BPS(di->bs);
+        return EOK;
+}
+
+int exfat_directory_open_parent(exfat_directory_t *di, 
+    devmap_handle_t devmap_handle, exfat_cluster_t firstc, bool fragmented)
+{
+        exfat_directory_init(di);
+        di->devmap_handle = devmap_handle;
+        di->fragmented = fragmented;
+        di->firstc = firstc;
+        di->bs = block_bb_get(devmap_handle);
+        di->blocks = 0;
         return EOK;
 }
@@ -84 +101 @@
 
         i = (di->pos * sizeof(exfat_dentry_t)) / BPS(di->bs);
-        if (i < di->blocks) {
-                if (di->b && di->bnum != i) {
-                        block_put(di->b);
+        if (di->nodep && (i >= di->blocks))
+                return ENOENT;
+
+        if (di->b && di->bnum != i) {
+                block_put(di->b);
+                di->b = NULL;
+        }
+        if (!di->b) {
+                if (di->nodep) {
+                        rc = exfat_block_get(&di->b, di->bs, di->nodep, i, BLOCK_FLAGS_NONE);
+                } else {
+                        rc = exfat_block_get_by_clst(&di->b, di->bs, di->devmap_handle,
+                            di->fragmented, di->firstc, NULL, i, BLOCK_FLAGS_NONE);
+                }
+                if (rc != EOK) {
                         di->b = NULL;
+                        return rc;
                 }
-                if (!di->b) {
-                        rc = exfat_block_get(&di->b, di->bs, di->nodep, i, BLOCK_FLAGS_NONE);
-                        if (rc != EOK) {
-                                di->b = NULL;
-                                return rc;
-                        }
-                        di->bnum = i;
-                }
-                return EOK;
-        }
-        return ENOENT;
+                di->bnum = i;
+        }
+        return EOK;
 }
 

uspace/srv/fs/exfat/exfat_directory.h

@@ -36 +36 @@
 #include <stdint.h>
 #include "exfat.h"
+#include "exfat_fat.h"
 #include "exfat_dentry.h"
 
@@ -42 +43 @@
         exfat_bs_t *bs;
         exfat_node_t *nodep;
+        devmap_handle_t devmap_handle;
         uint32_t blocks;
         uint32_t bnum;
@@ -47 +49 @@
         block_t *b;
         bool last;
+        bool fragmented;
+        exfat_cluster_t firstc;
 } __attribute__ ((packed)) exfat_directory_t;
 
@@ -52 +56 @@
 extern void exfat_directory_init(exfat_directory_t *di);
 extern int exfat_directory_open(exfat_node_t *nodep, exfat_directory_t *di);
+extern int exfat_directory_open_parent(exfat_directory_t *di, 
+    devmap_handle_t devmap_handle, exfat_cluster_t firstc, bool fragmented);
 extern int exfat_directory_close(exfat_directory_t *di);
 

uspace/srv/fs/exfat/exfat_ops.c

@@ -112 +112 @@
 static int exfat_node_sync(exfat_node_t *node)
 {
-        /* TODO */
+//      block_t *b;
+//      exfat_bs_t *bs;
+//      fat_dentry_t *d;
+//      int rc;
+
+//      assert(node->dirty);
+
+//      bs = block_bb_get(node->idx->devmap_handle);
+
+        /* Read the block that contains the dentry of interest. */
+/*
+        rc = _fat_block_get(&b, bs, node->idx->devmap_handle, node->idx->pfc,
+            NULL, (node->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs),
+            BLOCK_FLAGS_NONE);
+        if (rc != EOK)
+                return rc;
+
+        d = ((fat_dentry_t *)b->data) + (node->idx->pdi % DPS(bs));
+
+        d->firstc = host2uint16_t_le(node->firstc);
+        if (node->type == FAT_FILE) {
+                d->size = host2uint32_t_le(node->size);
+        } else if (node->type == FAT_DIRECTORY) {
+                d->attr = FAT_ATTR_SUBDIR;
+        }
+*/
+        /* TODO: update other fields? (e.g time fields) */
+
+//      b->dirty = true;                /* need to sync block */
+//      rc = block_put(b);
+//      return rc;
         return EOK;
 }
@@ -366 +396 @@
 
         if (nodep->fragmented) {
-                /* TODO */
                 rc = bitmap_append_clusters(bs, nodep, clusters);
                 if (rc != ENOSPC)
@@ -406 +435 @@
 
         if (nodep->fragmented) {
-                /* TODO */
                 exfat_cluster_t clsts, prev_clsts, new_clsts;
                 prev_clsts = ROUND_UP(nodep->size, BPC(bs)) / BPC(bs);
@@ -414 +442 @@
 
                 clsts = prev_clsts - new_clsts;
-                
                 rc = bitmap_free_clusters(bs, nodep, clsts);
                 if (rc != EOK)
@@ -688 +715 @@
          * dentry data is kept in the child node structure.
          */
-
-        /* TODO */
         rc = exfat_directory_write_file(&di, name);
         if (rc!=EOK)
@@ -897 +922 @@
         printf("Sectors per cluster: %d\n", SPC(bs));
         printf("KBytes per cluster: %d\n", SPC(bs)*BPS(bs)/1024);
-        
+
+        /* bitmap_set_cluster(bs, devmap_handle, 9); */
+        /* bitmap_clear_cluster(bs, devmap_handle, 9); */
+
         int i, rc;
         exfat_cluster_t clst;
-        for (i=0; i<6; i++) {
+        for (i=0; i<=10; i++) {
                 rc = exfat_get_cluster(bs, devmap_handle, i, &clst);
                 if (rc != EOK)
                         return;
-                printf("Clst %d: %x\n", i, clst);
+                printf("Clst %d: %x", i, clst);
+                if (i>=2)
+                        printf(", Bitmap: %d\n", bitmap_is_free(bs, devmap_handle, i)!=EOK);
+                else
+                        printf("\n");
         }
 }