Changeset cd3e6a2 in mainline

Timestamp:

2009-09-01T21:18:23Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0712ff2

Parents:

aac12264 (diff), 7a56b1ed (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 libblock improvements.

File:

• uspace/lib/libblock/libblock.c (modified) (4 diffs)

uspace/lib/libblock/libblock.c

@@ -345 +345 @@
         link_t *l;
         unsigned long key = boff;
-        int rc = EOK;
+        int rc;
         
         devcon = devcon_search(dev_handle);
@@ -355 +355 @@
 
 retry:
+        rc = EOK;
+        b = NULL;
+
         fibril_mutex_lock(&cache->lock);
         l = hash_table_find(&cache->block_hash, &key);
@@ -394 +397 @@
                         unsigned long temp_key;
 recycle:
-                        assert(!list_empty(&cache->free_head));
+                        if (list_empty(&cache->free_head)) {
+                                fibril_mutex_unlock(&cache->lock);
+                                rc = ENOMEM;
+                                goto out;
+                        }
                         l = cache->free_head.next;
                         b = list_get_instance(l, block_t, free_link);
@@ -477 +484 @@
 
                 fibril_mutex_unlock(&b->lock);
+        }
+out:
+        if ((rc != EOK) && b) {
+                assert(b->toxic);
+                (void) block_put(b);
+                b = NULL;
         }
         *block = b;