Changeset e402382 in mainline

Timestamp:

2009-09-03T13:24:36Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dc87ad11

Parents:

684b655

Message:

Make fat_cluster_walk() return an error code.

Location:

uspace/srv/fs/fat

Files:

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

uspace/srv/fs/fat/fat_fat.c

@@ -61 +61 @@
  * @param dev_handle    Device handle of the device with the file.
  * @param firstc        First cluster to start the walk with.
- * @param lastc         If non-NULL, output argument hodling the last cluster number visited.
+ * @param lastc         If non-NULL, output argument hodling the last cluster
+ *                      number visited.
+ * @param numc          If non-NULL, output argument holding the number of
+ *                      clusters seen during the walk.
  * @param max_clusters  Maximum number of clusters to visit.    
  *
- * @return              Number of clusters seen during the walk.
- */
-uint16_t 
+ * @return              EOK on success or a negative error code.
+ */
+int 
 fat_cluster_walk(fat_bs_t *bs, dev_handle_t dev_handle, fat_cluster_t firstc,
-    fat_cluster_t *lastc, uint16_t max_clusters)
+    fat_cluster_t *lastc, uint16_t *numc, uint16_t max_clusters)
 {
         block_t *b;
@@ -84 +87 @@
                 if (lastc)
                         *lastc = firstc;
-                return 0;
+                if (numc)
+                        *numc = 0;
+                return EOK;
         }
 
@@ -98 +103 @@
                 /* read FAT1 */
                 rc = block_get(&b, dev_handle, rscnt + fsec, BLOCK_FLAGS_NONE);
-                assert(rc == EOK);
+                if (rc != EOK)
+                        return rc;
                 clst = uint16_t_le2host(((fat_cluster_t *)b->data)[fidx]);
                 assert(clst != FAT_CLST_BAD);
                 rc = block_put(b);
-                assert(rc == EOK);
+                if (rc != EOK)
+                        return rc;
                 clusters++;
         }
@@ -108 +115 @@
         if (lastc && clst < FAT_CLST_LAST1)
                 *lastc = clst;
-
-        return clusters;
+        if (numc)
+                *numc = clusters;
+
+        return EOK;
 }
 
@@ -134 +143 @@
         unsigned sf;
         unsigned ssa;           /* size of the system area */
-        unsigned clusters, max_clusters;
+        uint16_t clusters;
+        unsigned max_clusters;
         fat_cluster_t lastc;
         int rc;
@@ -156 +166 @@
 
         max_clusters = bn / bs->spc;
-        clusters = fat_cluster_walk(bs, dev_handle, firstc, &lastc,
+        rc = fat_cluster_walk(bs, dev_handle, firstc, &lastc, &clusters,
             max_clusters);
+        if (rc != EOK)
+                return rc;
         assert(clusters == max_clusters);
 
@@ -425 +437 @@
         dev_handle_t dev_handle = nodep->idx->dev_handle;
         fat_cluster_t lcl;
+        uint16_t numc;
         uint8_t fatno;
-
-        if (fat_cluster_walk(bs, dev_handle, nodep->firstc, &lcl,
-            (uint16_t) -1) == 0) {
+        int rc;
+
+        rc = fat_cluster_walk(bs, dev_handle, nodep->firstc, &lcl, &numc,
+            (uint16_t) -1);
+        assert(rc == EOK);
+
+        if (numc == 0) {
                 /* No clusters allocated to the node yet. */
                 nodep->firstc = mcl;

uspace/srv/fs/fat/fat_fat.h

@@ -59 +59 @@
 typedef uint16_t fat_cluster_t;
 
-#define fat_clusters_get(bs, dh, fc) \
-    fat_cluster_walk((bs), (dh), (fc), NULL, (uint16_t) -1)
-extern uint16_t fat_cluster_walk(struct fat_bs *, dev_handle_t, fat_cluster_t,
-    fat_cluster_t *, uint16_t);
+#define fat_clusters_get(numc, bs, dh, fc) \
+    fat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint16_t) -1)
+extern int fat_cluster_walk(struct fat_bs *, dev_handle_t, fat_cluster_t,
+    fat_cluster_t *, uint16_t *, uint16_t);
 
 #define fat_block_get(b, bs, np, bn, flags) \

uspace/srv/fs/fat/fat_ops.c

@@ -220 +220 @@
                  * size of the directory by walking the FAT.
                  */
-                nodep->size = bps * spc * fat_clusters_get(bs, idxp->dev_handle,
+                uint16_t clusters;
+                rc = fat_clusters_get(&clusters, bs, idxp->dev_handle,
                     uint16_t_le2host(d->firstc));
+                assert(rc == EOK);
+                nodep->size = bps * spc * clusters;
         } else {
                 nodep->type = FAT_FILE;
@@ -1189 +1192 @@
                 } else {
                         fat_cluster_t lastc;
-                        (void) fat_cluster_walk(bs, dev_handle, nodep->firstc,
-                            &lastc, (size - 1) / bpc);
+                        rc = fat_cluster_walk(bs, dev_handle, nodep->firstc,
+                            &lastc, NULL, (size - 1) / bpc);
+                        if (rc != EOK)
+                                goto out;
                         fat_chop_clusters(bs, nodep, lastc);
                 }
@@ -1197 +1202 @@
                 rc = EOK;       
         }
+out:
         fat_node_put(fn);
         ipc_answer_0(rid, rc);