Changeset 9a15176 in mainline

Timestamp:

2009-10-01T11:32:04Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8810c63

Parents:

0fc1e5d

Message:

Make fat_idx_get_new() return the exact error code.

Location:

uspace/srv/fs/fat

Files:

• fat.h (modified) (1 diff)
• fat_idx.c (modified) (5 diffs)
• fat_ops.c (modified) (1 diff)

uspace/srv/fs/fat/fat.h

@@ -215 +215 @@
 extern void fat_sync(ipc_callid_t, ipc_call_t *);
 
-extern fat_idx_t *fat_idx_get_new(dev_handle_t);
+extern int fat_idx_get_new(fat_idx_t **, dev_handle_t);
 extern fat_idx_t *fat_idx_get_by_pos(dev_handle_t, fat_cluster_t, unsigned);
 extern fat_idx_t *fat_idx_get_by_index(dev_handle_t, fs_index_t);

uspace/srv/fs/fat/fat_idx.c

@@ -339 +339 @@
 }
 
-static fat_idx_t *fat_idx_create(dev_handle_t dev_handle)
+static int fat_idx_create(fat_idx_t **fidxp, dev_handle_t dev_handle)
 {
         fat_idx_t *fidx;
@@ -345 +345 @@
         fidx = (fat_idx_t *) malloc(sizeof(fat_idx_t));
         if (!fidx) 
-                return NULL;
+                return ENOMEM;
         if (!fat_index_alloc(dev_handle, &fidx->index)) {
                 free(fidx);
-                return NULL;
+                return ENOSPC;
         }
                 
@@ -359 +359 @@
         fidx->nodep = NULL;
 
-        return fidx;
-}
-
-fat_idx_t *fat_idx_get_new(dev_handle_t dev_handle)
+        *fidxp = fidx;
+        return EOK;
+}
+
+int fat_idx_get_new(fat_idx_t **fidxp, dev_handle_t dev_handle)
 {
         fat_idx_t *fidx;
+        int rc;
 
         fibril_mutex_lock(&used_lock);
-        fidx = fat_idx_create(dev_handle);
-        if (!fidx) {
+        rc = fat_idx_create(&fidx, dev_handle);
+        if (rc != EOK) {
                 fibril_mutex_unlock(&used_lock);
-                return NULL;
+                return rc;
         }
                 
@@ -382 +384 @@
         fibril_mutex_unlock(&used_lock);
 
-        return fidx;
+        *fidxp = fidx;
+        return EOK;
 }
 
@@ -401 +404 @@
                 fidx = hash_table_get_instance(l, fat_idx_t, uph_link);
         } else {
-                fidx = fat_idx_create(dev_handle);
-                if (!fidx) {
+                int rc;
+
+                rc = fat_idx_create(&fidx, dev_handle);
+                if (rc != EOK) {
                         fibril_mutex_unlock(&used_lock);
                         return NULL;

uspace/srv/fs/fat/fat_ops.c

@@ -462 +462 @@
                 return rc;
         }
-        idxp = fat_idx_get_new(dev_handle);
-        if (!idxp) {
+        rc = fat_idx_get_new(&idxp, dev_handle);
+        if (rc != EOK) {
                 (void) fat_free_clusters(bs, dev_handle, mcl);  
                 (void) fat_node_put(FS_NODE(nodep));
-                return ENOMEM;  /* FIXME: determine the true error code */
+                return rc;
         }
         /* idxp->lock held */