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

Timestamp:

2009-09-21T16:00:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46c0498

Parents:

4098e38

Message:

Make fat_link() return an error code instead of hitting an assertion on an I/O
error.

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -445 +445 @@
         for (i = 0; i < blocks; i++) {
                 rc = fat_block_get(&b, bs, parentp, i, BLOCK_FLAGS_NONE);
-                assert(rc == EOK);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&parentp->idx->lock);
+                        return rc;
+                }
                 for (j = 0; j < dps; j++) {
                         d = ((fat_dentry_t *)b->data) + j;
@@ -460 +463 @@
                 }
                 rc = block_put(b);
-                assert(rc == EOK);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&parentp->idx->lock);
+                        return rc;
+                }
         }
         j = 0;
@@ -478 +484 @@
         }
         rc = fat_zero_cluster(bs, parentp->idx->dev_handle, mcl);
-        assert(rc == EOK);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
         rc = fat_append_clusters(bs, parentp, mcl);
-        assert(rc == EOK);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
         parentp->size += bps * bs->spc;
         parentp->dirty = true;          /* need to sync node */
         rc = fat_block_get(&b, bs, parentp, i, BLOCK_FLAGS_NONE);
-        assert(rc == EOK);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
         d = (fat_dentry_t *)b->data;
 
@@ -498 +513 @@
         b->dirty = true;                /* need to sync block */
         rc = block_put(b);
-        assert(rc == EOK);
         fibril_mutex_unlock(&parentp->idx->lock);
+        if (rc != EOK) 
+                return rc;
 
         fibril_mutex_lock(&childp->idx->lock);
@@ -510 +526 @@
          */
         rc = fat_block_get(&b, bs, childp, 0, BLOCK_FLAGS_NONE);
-        assert(rc == EOK);
+        if (rc != EOK) {
+                /*
+                 * Rather than returning an error, simply skip the creation of
+                 * these two entries.
+                 */
+                goto skip_dots;
+        }
         d = (fat_dentry_t *)b->data;
         if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
@@ -534 +556 @@
         }
         b->dirty = true;                /* need to sync block */
-        rc = block_put(b);
-        assert(rc == EOK);
+        /*
+         * Ignore the return value as we would have fallen through on error
+         * anyway.
+         */
+        (void) block_put(b);
+skip_dots:
 
         childp->idx->pfc = parentp->firstc;