Changeset 8b655705 in mainline for uspace/lib/block/libblock.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/lib/block/libblock.c (modified) (11 diffs)

uspace/lib/block/libblock.c

@@ -44 +44 @@
 #include <sys/mman.h>
 #include <async.h>
-#include <ipc/ipc.h>
 #include <as.h>
 #include <assert.h>
@@ -177 +176 @@
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -183 +182 @@
         if (get_block_size(dev_phone, &bsize) != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -190 +189 @@
         if (rc != EOK) {
                 munmap(comm_area, comm_size);
-                ipc_hangup(dev_phone);
+                async_hangup(dev_phone);
                 return rc;
         }
@@ -211 +210 @@
 
         munmap(devcon->comm_area, devcon->comm_size);
-        ipc_hangup(devcon->dev_phone);
+        async_hangup(devcon->dev_phone);
 
         free(devcon);   
@@ -295 +294 @@
 
         /* Allow 1:1 or small-to-large block size translation */
-        if (cache->lblock_size % devcon->pblock_size != 0)
+        if (cache->lblock_size % devcon->pblock_size != 0) {
+                free(cache);
                 return ENOTSUP;
+        }
 
         cache->blocks_cluster = cache->lblock_size / devcon->pblock_size;
@@ -410 +411 @@
         l = hash_table_find(&cache->block_hash, &key);
         if (l) {
+found:
                 /*
                  * We found the block in the cache.
@@ -437 +439 @@
                         if (!b->data) {
                                 free(b);
+                                b = NULL;
                                 goto recycle;
                         }
@@ -492 +495 @@
                                         goto retry;
                                 }
+                                l = hash_table_find(&cache->block_hash, &key);
+                                if (l) {
+                                        /*
+                                         * Someone else must have already
+                                         * instantiated the block while we were
+                                         * not holding the cache lock.
+                                         * Leave the recycled block on the
+                                         * freelist and continue as if we
+                                         * found the block of interest during
+                                         * the first try.
+                                         */
+                                        fibril_mutex_unlock(&b->lock);
+                                        goto found;
+                                }
 
                         }
@@ -564 +581 @@
         assert(devcon);
         assert(devcon->cache);
+        assert(block->refcnt >= 1);
 
         cache = devcon->cache;
@@ -623 +641 @@
                         unsigned long key = block->lba;
                         hash_table_remove(&cache->block_hash, &key, 1);
+                        fibril_mutex_unlock(&block->lock);
+                        free(block->data);
                         free(block);
-                        free(block->data);
                         cache->blocks_cached--;
                         fibril_mutex_unlock(&cache->lock);