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

Timestamp:

2009-09-21T16:11:52Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0daba21, d27ed12

Parents:

c1618ed (diff), 46c0498 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge FAT server error handling improvements.

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -78 +78 @@
 }
 
-static void fat_node_sync(fat_node_t *node)
+static int fat_node_sync(fat_node_t *node)
 {
         block_t *b;
@@ -96 +96 @@
         rc = _fat_block_get(&b, bs, node->idx->dev_handle, node->idx->pfc,
             (node->idx->pdi * sizeof(fat_dentry_t)) / bps, BLOCK_FLAGS_NONE);
-        assert(rc == EOK);
+        if (rc != EOK)
+                return rc;
 
         d = ((fat_dentry_t *)b->data) + (node->idx->pdi % dps);
@@ -111 +112 @@
         b->dirty = true;                /* need to sync block */
         rc = block_put(b);
-        assert(rc == EOK);
+        return rc;
 }
 
@@ -118 +119 @@
         fs_node_t *fn;
         fat_node_t *nodep;
+        int rc;
 
         fibril_mutex_lock(&ffn_mutex);
@@ -133 +135 @@
                 list_remove(&nodep->ffn_link);
                 fibril_mutex_unlock(&ffn_mutex);
-                if (nodep->dirty)
-                        fat_node_sync(nodep);
+                if (nodep->dirty) {
+                        rc = fat_node_sync(nodep);
+                        assert(rc == EOK);
+                }
                 idxp_tmp->nodep = NULL;
                 fibril_mutex_unlock(&nodep->lock);
@@ -441 +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;
@@ -456 +463 @@
                 }
                 rc = block_put(b);
-                assert(rc == EOK);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&parentp->idx->lock);
+                        return rc;
+                }
         }
         j = 0;
@@ -474 +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;
 
@@ -494 +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);
@@ -506 +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 ||
@@ -530 +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;
@@ -576 +606 @@
             (childp->idx->pdi * sizeof(fat_dentry_t)) / bps,
             BLOCK_FLAGS_NONE);
-        assert(rc == EOK);
+        if (rc != EOK) 
+                goto error;
         d = (fat_dentry_t *)b->data +
             (childp->idx->pdi % (bps / sizeof(fat_dentry_t)));
@@ -583 +614 @@
         b->dirty = true;                /* need to sync block */
         rc = block_put(b);
-        assert(rc == EOK);
+        if (rc != EOK)
+                goto error;
 
         /* remove the index structure from the position hash */
@@ -597 +629 @@
 
         return EOK;
+
+error:
+        fibril_mutex_unlock(&parentp->idx->lock);
+        fibril_mutex_unlock(&childp->lock);
+        fibril_mutex_unlock(&childp->idx->lock);
+        return rc;
 }