Changeset 2f636b6 in mainline

Timestamp:

2009-09-03T15:04:59Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d044447, f6b5593

Parents:

cca29e3c

Message:

Do not abort in fat_alloc_clusters() when an I/O error is detected.

File:

• uspace/srv/fs/fat/fat_fat.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_fat.c

@@ -379 +379 @@
         for (b = 0, cl = 0; b < sf; b++) {
                 rc = block_get(&blk, dev_handle, rscnt + b, BLOCK_FLAGS_NONE);
+                if (rc != EOK)
+                        goto error;
                 for (c = 0; c < bps / sizeof(fat_cluster_t); c++, cl++) {
                         fat_cluster_t *clst = (fat_cluster_t *)blk->data + c;
@@ -394 +396 @@
                                         /* we are almost done */
                                         rc = block_put(blk);
-                                        assert(rc == EOK);
+                                        if (rc != EOK)
+                                                goto error;
                                         /* update the shadow copies of FAT */
                                         rc = fat_alloc_shadow_clusters(bs,
                                             dev_handle, lifo, nclsts);
-                                        assert(rc == EOK);
+                                        if (rc != EOK)
+                                                goto error;
                                         *mcl = lifo[found - 1];
                                         *lcl = lifo[0];
@@ -408 +412 @@
                 }
                 rc = block_put(blk);
-                assert(rc == EOK);
+                if (rc != EOK) {
+error:
+                        fibril_mutex_unlock(&fat_alloc_lock);
+                        free(lifo);
+                        return rc;
+                }
         }
         fibril_mutex_unlock(&fat_alloc_lock);