Changeset 93e12f3 in mainline

Timestamp:

2011-08-15T21:47:38Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

a9b756e

Parents:

bca3eac

Message:

exFAT: allocate 1 cluster while creating directory similar to FAT server

File:

• uspace/srv/fs/exfat/exfat_ops.c (modified) (9 diffs)

uspace/srv/fs/exfat/exfat_ops.c

@@ -137 +137 @@
         exfat_directory_open_parent(&di, node->idx->devmap_handle, node->idx->pfc, 
             node->idx->parent_fragmented);
+        rc = exfat_directory_seek(&di, node->idx->pdi);
+        if (rc != EOK) {
+                (void) exfat_directory_close(&di);
+                return rc;
+        }
+
         rc = exfat_directory_sync_file(&di, &df, &ds);
         if (rc != EOK) {
@@ -614 +620 @@
         exfat_idx_t *idxp;
         exfat_node_t *nodep;
-        int rc;
-
+        exfat_bs_t *bs;
+        int rc;
+
+        bs = block_bb_get(devmap_handle);
         rc = exfat_node_get_new(&nodep);
         if (rc != EOK)
@@ -625 +633 @@
                 return rc;
         }
-
-        if (flags & L_DIRECTORY)
-                nodep->type = EXFAT_DIRECTORY;
-        else
-                nodep->type = EXFAT_FILE;
 
         nodep->firstc = 0;
@@ -640 +643 @@
         nodep->idx = idxp;
         idxp->nodep = nodep;
-
         fibril_mutex_unlock(&idxp->lock);
+
+        if (flags & L_DIRECTORY) {
+                nodep->type = EXFAT_DIRECTORY;
+                rc = exfat_node_expand(devmap_handle, nodep, 1);
+                if (rc != EOK) {
+                        (void) exfat_node_put(FS_NODE(nodep));
+                        return rc;
+                }
+                nodep->size = BPC(bs);
+        } else {
+                nodep->type = EXFAT_FILE;
+        }
+
         *rfn = FS_NODE(nodep);
         return EOK;
@@ -712 +727 @@
         if (rc != EOK)
                 return rc;
-
         /*
          * At this point we only establish the link between the parent and the
@@ -735 +749 @@
         childp->idx->pfc = parentp->firstc;
         childp->idx->parent_fragmented = parentp->fragmented;
-        childp->idx->pdi = di.pos;      /* di.pos holds absolute position of SFN entry */
+        childp->idx->pdi = di.pos;
         fibril_mutex_unlock(&childp->idx->lock);
 
@@ -932 +946 @@
         int i, rc;
         exfat_cluster_t clst;
-        for (i=0; i<=10; i++) {
+        for (i=0; i<=7; i++) {
                 rc = exfat_get_cluster(bs, devmap_handle, i, &clst);
                 if (rc != EOK)
@@ -1168 +1182 @@
         return EOK;
 }
-
-/*
-int bitmap_is_allocated(exfat_bs_t *bs, devmap_handle_t devmap_handle,
-    exfat_cluster_t clst, bool *status)
-{
-        fs_node_t *fn;
-        exfat_node_t *bitmap;
-        int rc;
-
-        rc = exfat_bitmap_get(&fn, devmap_handle);
-        if (rc != EOK)
-                return rc;
-
-        nbitmap = EXFAT_NODE(fn);
-
-        
-        return EOK;
-}
-*/
 
 static int
@@ -1364 +1359 @@
 
         boundary = ROUND_UP(nodep->size, BPC(bs));
-
         if (pos >= boundary) {
                 unsigned nclsts;