Changeset 7ae249d in mainline for uspace/lib/block/libblock.c

Timestamp:

2011-07-29T14:47:52Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

00c2de63, 1814ee4d, ffff746

Parents:

9350bfdd (diff), f5d51de (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.

File:

• uspace/lib/block/libblock.c (modified) (11 diffs)

uspace/lib/block/libblock.c

@@ -258 +258 @@
 static hash_index_t cache_hash(unsigned long *key)
 {
-        return *key & (CACHE_BUCKETS - 1);
+        return MERGE_LOUP32(key[0], key[1]) & (CACHE_BUCKETS - 1);
 }
 
@@ -264 +264 @@
 {
         block_t *b = hash_table_get_instance(item, block_t, hash_link);
-        return b->lba == *key;
+        return b->lba == MERGE_LOUP32(key[0], key[1]);
 }
 
@@ -305 +305 @@
         cache->blocks_cluster = cache->lblock_size / devcon->pblock_size;
 
-        if (!hash_table_create(&cache->block_hash, CACHE_BUCKETS, 1,
+        if (!hash_table_create(&cache->block_hash, CACHE_BUCKETS, 2,
             &cache_ops)) {
                 free(cache);
@@ -344 +344 @@
                 }
 
-                unsigned long key = b->lba;
-                hash_table_remove(&cache->block_hash, &key, 1);
+                unsigned long key[2] = {
+                        LOWER32(b->lba),
+                        UPPER32(b->lba)
+                };
+                hash_table_remove(&cache->block_hash, key, 2);
                 
                 free(b->data);
@@ -398 +401 @@
         block_t *b;
         link_t *l;
-        unsigned long key = ba;
+        unsigned long key[2] = {
+                LOWER32(ba),
+                UPPER32(ba)
+        };
+
         int rc;
         
@@ -413 +420 @@
 
         fibril_mutex_lock(&cache->lock);
-        l = hash_table_find(&cache->block_hash, &key);
+        l = hash_table_find(&cache->block_hash, key);
         if (l) {
 found:
@@ -451 +458 @@
                          * Try to recycle a block from the free list.
                          */
-                        unsigned long temp_key;
 recycle:
                         if (list_empty(&cache->free_list)) {
@@ -499 +505 @@
                                         goto retry;
                                 }
-                                l = hash_table_find(&cache->block_hash, &key);
+                                l = hash_table_find(&cache->block_hash, key);
                                 if (l) {
                                         /*
@@ -522 +528 @@
                          */
                         list_remove(&b->free_link);
-                        temp_key = b->lba;
-                        hash_table_remove(&cache->block_hash, &temp_key, 1);
+                        unsigned long temp_key[2] = {
+                                LOWER32(b->lba),
+                                UPPER32(b->lba)
+                        };
+                        hash_table_remove(&cache->block_hash, temp_key, 2);
                 }
 
@@ -531 +540 @@
                 b->lba = ba;
                 b->pba = ba_ltop(devcon, b->lba);
-                hash_table_insert(&cache->block_hash, &key, &b->hash_link);
+                hash_table_insert(&cache->block_hash, key, &b->hash_link);
 
                 /*
@@ -643 +652 @@
                          * Take the block out of the cache and free it.
                          */
-                        unsigned long key = block->lba;
-                        hash_table_remove(&cache->block_hash, &key, 1);
+                        unsigned long key[2] = {
+                                LOWER32(block->lba),
+                                UPPER32(block->lba)
+                        };
+                        hash_table_remove(&cache->block_hash, key, 2);
                         fibril_mutex_unlock(&block->lock);
                         free(block->data);