Changeset 4098e38 in mainline

Timestamp:

2009-09-21T15:28:11Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4b4668e

Parents:

f6b5593

Message:

Make fat_node_sync() return an error code.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (5 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);