Changeset 985e26d2 in mainline for uspace/srv/fs/fat/fat_idx.c

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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 mainline changes.

File:

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

uspace/srv/fs/fat/fat_idx.c

@@ -43 +43 @@
 #include <adt/list.h>
 #include <assert.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 
 /** Each instance of this type describes one interval of freed VFS indices. */
@@ -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;