Changeset cca29e3c in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2009-09-03T14:46:17Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2f636b6

Parents:

dc87ad11

Message:

Make fat_append_clusters(), fat_chop_clusters(), fat_free_clusters(),
fat_alloc_shadow_clusters(), fat_set_cluster(), fat_fill_gap() and
fat_zero_cluster() return an error code.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (11 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -329 +329 @@
         nodep = fat_node_get_new();
         if (!nodep) {
-                fat_free_clusters(bs, dev_handle, mcl); 
+                (void) fat_free_clusters(bs, dev_handle, mcl);
                 return NULL;
         }
         idxp = fat_idx_get_new(dev_handle);
         if (!idxp) {
-                fat_free_clusters(bs, dev_handle, mcl); 
+                (void) fat_free_clusters(bs, dev_handle, mcl);  
                 fat_node_put(FS_NODE(nodep));
                 return NULL;
@@ -341 +341 @@
         if (flags & L_DIRECTORY) {
                 /* Populate the new cluster with unused dentries. */
-                fat_zero_cluster(bs, dev_handle, mcl);
+                rc = fat_zero_cluster(bs, dev_handle, mcl);
+                assert(rc == EOK);
                 nodep->type = FAT_DIRECTORY;
                 nodep->firstc = mcl;
@@ -365 +366 @@
         fat_node_t *nodep = FAT_NODE(fn);
         fat_bs_t *bs;
+        int rc = EOK;
 
         /*
@@ -383 +385 @@
                 assert(nodep->size);
                 /* Free all clusters allocated to the node. */
-                fat_free_clusters(bs, nodep->idx->dev_handle, nodep->firstc);
+                rc = fat_free_clusters(bs, nodep->idx->dev_handle,
+                    nodep->firstc);
         }
 
@@ -389 +392 @@
         free(nodep->bp);
         free(nodep);
-        return EOK;
+        return rc;
 }
 
@@ -470 +473 @@
                 return rc;
         }
-        fat_zero_cluster(bs, parentp->idx->dev_handle, mcl);
-        fat_append_clusters(bs, parentp, mcl);
+        rc = fat_zero_cluster(bs, parentp->idx->dev_handle, mcl);
+        assert(rc == EOK);
+        rc = fat_append_clusters(bs, parentp, mcl);
+        assert(rc == EOK);
         parentp->size += bps * bs->spc;
         parentp->dirty = true;          /* need to sync node */
@@ -1088 +1093 @@
                  * next block size boundary.
                  */
-                fat_fill_gap(bs, nodep, FAT_CLST_RES0, pos);
+                rc = fat_fill_gap(bs, nodep, FAT_CLST_RES0, pos);
+                assert(rc == EOK);
                 rc = fat_block_get(&b, bs, nodep, pos / bps, flags);
                 assert(rc == EOK);
@@ -1123 +1129 @@
                 }
                 /* zero fill any gaps */
-                fat_fill_gap(bs, nodep, mcl, pos);
+                rc = fat_fill_gap(bs, nodep, mcl, pos);
+                assert(rc == EOK);
                 rc = _fat_block_get(&b, bs, dev_handle, lcl, (pos / bps) % spc,
                     flags);
@@ -1136 +1143 @@
                  * node's cluster chain.
                  */
-                fat_append_clusters(bs, nodep, mcl);
+                rc = fat_append_clusters(bs, nodep, mcl);
+                assert(rc == EOK);
                 nodep->size = pos + bytes;
                 nodep->dirty = true;            /* need to sync node */
@@ -1189 +1197 @@
                  */
                 if (size == 0) {
-                        fat_chop_clusters(bs, nodep, FAT_CLST_RES0);
+                        rc = fat_chop_clusters(bs, nodep, FAT_CLST_RES0);
+                        if (rc != EOK)
+                                goto out;
                 } else {
                         fat_cluster_t lastc;
@@ -1196 +1206 @@
                         if (rc != EOK)
                                 goto out;
-                        fat_chop_clusters(bs, nodep, lastc);
+                        rc = fat_chop_clusters(bs, nodep, lastc);
+                        if (rc != EOK)
+                                goto out;
                 }
                 nodep->size = size;