Changeset 17bf658 in mainline

Timestamp:

2009-10-01T10:24:45Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0fc1e5d

Parents:

e6bc3a5

Message:

Make fat_node_get_new() return an error code.

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -115 +115 @@
 }
 
-static fat_node_t *fat_node_get_new(void)
+static int fat_node_get_new(fat_node_t **nodepp)
 {
         fs_node_t *fn;
@@ -137 +137 @@
                 if (nodep->dirty) {
                         rc = fat_node_sync(nodep);
-                        assert(rc == EOK);
+                        if (rc != EOK) {
+                                idxp_tmp->nodep = NULL;
+                                fibril_mutex_unlock(&nodep->lock);
+                                fibril_mutex_unlock(&idxp_tmp->lock);
+                                free(nodep->bp);
+                                free(nodep);
+                                return rc;
+                        }
                 }
                 idxp_tmp->nodep = NULL;
@@ -149 +156 @@
                 fn = (fs_node_t *)malloc(sizeof(fs_node_t));
                 if (!fn)
-                        return NULL;
+                        return ENOMEM;
                 nodep = (fat_node_t *)malloc(sizeof(fat_node_t));
                 if (!nodep) {
                         free(fn);
-                        return NULL;
+                        return ENOMEM;
                 }
         }
@@ -161 +168 @@
         nodep->bp = fn;
         
-        return nodep;
+        *nodepp = nodep;
+        return EOK;
 }
 
@@ -200 +208 @@
         assert(idxp->pfc);
 
-        nodep = fat_node_get_new();
-        if (!nodep)
+        rc = fat_node_get_new(&nodep);
+        if (rc != EOK)
                 return NULL;
 
@@ -432 +440 @@
         }
 
-        nodep = fat_node_get_new();
-        if (!nodep) {
+        rc = fat_node_get_new(&nodep);
+        if (rc != EOK) {
                 (void) fat_free_clusters(bs, dev_handle, mcl);
-                return ENOMEM;  /* FIXME: determine the true error code */
+                return rc;
         }
         idxp = fat_idx_get_new(dev_handle);