Changeset 453f2e75 in mainline

Timestamp:

2009-11-03T22:24:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dfddfcd

Parents:

1647323

Message:

Make fat_read() never assert on an I/O error.

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -1077 +1077 @@
                         rc = fat_block_get(&b, bs, nodep, pos / bps,
                             BLOCK_FLAGS_NONE);
-                        assert(rc == EOK);
+                        if (rc != EOK) {
+                                fat_node_put(fn);
+                                ipc_answer_0(callid, rc);
+                                ipc_answer_0(rid, rc);
+                                return;
+                        }
                         (void) async_data_read_finalize(callid, b->data + pos % bps,
                             bytes);
                         rc = block_put(b);
-                        assert(rc == EOK);
+                        if (rc != EOK) {
+                                fat_node_put(fn);
+                                ipc_answer_0(rid, rc);
+                                return;
+                        }
                 }
         } else {
@@ -1105 +1114 @@
                         rc = fat_block_get(&b, bs, nodep, bnum,
                             BLOCK_FLAGS_NONE);
-                        assert(rc == EOK);
+                        if (rc != EOK)
+                                goto err;
                         for (o = pos % (bps / sizeof(fat_dentry_t));
                             o < bps / sizeof(fat_dentry_t);
@@ -1116 +1126 @@
                                 case FAT_DENTRY_LAST:
                                         rc = block_put(b);
-                                        assert(rc == EOK);
+                                        if (rc != EOK)
+                                                goto err;
                                         goto miss;
                                 default:
@@ -1122 +1133 @@
                                         fat_dentry_name_get(d, name);
                                         rc = block_put(b);
-                                        assert(rc == EOK);
+                                        if (rc != EOK)
+                                                goto err;
                                         goto hit;
                                 }
                         }
                         rc = block_put(b);
-                        assert(rc == EOK);
+                        if (rc != EOK)
+                                goto err;
                         bnum++;
                 }
 miss:
-                fat_node_put(fn);
-                ipc_answer_0(callid, ENOENT);
-                ipc_answer_1(rid, ENOENT, 0);
-                return;
+                rc = fat_node_put(fn);
+                ipc_answer_0(callid, rc != EOK ? rc : ENOENT);
+                ipc_answer_1(rid, rc != EOK ? rc : ENOENT, 0);
+                return;
+
+err:
+                (void) fat_node_put(fn);
+                ipc_answer_0(callid, rc);
+                ipc_answer_0(rid, rc);
+                return;
+
 hit:
                 (void) async_data_read_finalize(callid, name, str_size(name) + 1);
@@ -1140 +1160 @@
         }
 
-        fat_node_put(fn);
-        ipc_answer_1(rid, EOK, (ipcarg_t)bytes);
+        rc = fat_node_put(fn);
+        ipc_answer_1(rid, rc, (ipcarg_t)bytes);
 }