Changeset e17d986 in mainline

Timestamp:

2008-10-26T19:49:14Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cb682eb

Parents:

a429bfb

Message:

Implementation of fat_append_clusters().

Location:

uspace/srv/fs/fat

Files:

• fat_fat.c (modified) (5 diffs)
• fat_fat.h (modified) (1 diff)
• fat_ops.c (modified) (1 diff)

uspace/srv/fs/fat/fat_fat.c

@@ -109 +109 @@
  * @param dev_handle    Device handle of the device with the file.
  * @param firstc        First cluster of the file.
+ * @param lastc         If non-NULL, output argument holding the
+ *                      last cluster.
  *
  * @return              Number of blocks allocated to the file.
  */
 uint16_t 
-_fat_blcks_get(dev_handle_t dev_handle, fat_cluster_t firstc)
+_fat_blcks_get(dev_handle_t dev_handle, fat_cluster_t firstc,
+    fat_cluster_t *lastc)
 {
         block_t *bb;
@@ -131 +134 @@
         if (firstc == FAT_CLST_RES0) {
                 /* No space allocated to the file. */
+                if (lastc)
+                        *lastc = firstc;
                 return 0;
         }
@@ -139 +144 @@
 
                 assert(clst >= FAT_CLST_FIRST);
+                if (lastc)
+                        *lastc = clst;          /* remember the last cluster */
                 fsec = (clst * sizeof(fat_cluster_t)) / bps;
                 fidx = clst % (bps / sizeof(fat_cluster_t));
@@ -149 +156 @@
         }
 
+        if (lastc)
+                *lastc = clst;
         return clusters * spc;
 }
@@ -325 +334 @@
 void fat_append_clusters(fat_node_t *nodep, fat_cluster_t mcl)
 {
+        block_t *bb;
+        fat_cluster_t lcl;
+        uint8_t fatcnt, fatno;
+
+        if (_fat_blcks_get(nodep->idx->dev_handle, nodep->firstc, &lcl) == 0) {
+                nodep->firstc = host2uint16_t_le(mcl);
+                nodep->dirty = true;            /* need to sync node */
+                return;
+        }
+
+        bb = block_get(nodep->idx->dev_handle, BS_BLOCK, BS_SIZE);
+        fatcnt = FAT_BS(bb)->fatcnt;
+        block_put(bb);
+
+        for (fatno = FAT1; fatno < fatcnt; fatno++)
+                fat_mark_cluster(nodep->idx->dev_handle, fatno, lcl, mcl);
 }
 

uspace/srv/fs/fat/fat_fat.h

@@ -62 +62 @@
     
 extern struct block *_fat_block_get(dev_handle_t, fat_cluster_t, off_t);
-extern uint16_t _fat_blcks_get(dev_handle_t, fat_cluster_t);
+extern uint16_t _fat_blcks_get(dev_handle_t, fat_cluster_t, fat_cluster_t *);
 extern uint16_t fat_bps_get(dev_handle_t);
   

uspace/srv/fs/fat/fat_ops.c

@@ -201 +201 @@
                  */
                 nodep->size = bps * _fat_blcks_get(idxp->dev_handle,
-                    uint16_t_le2host(d->firstc));
+                    uint16_t_le2host(d->firstc), NULL);
         } else {
                 nodep->type = FAT_FILE;