Changeset e950803 in mainline for uspace/lib

Timestamp:

2011-02-03T20:20:01Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bfe43d5a

Parents:

bd81386 (diff), b366a1bc (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 from lp:~jakub/helenos/fs.

Location:

uspace/lib

Files:

• block/libblock.c (modified) (4 diffs)
• c/generic/async.c (modified) (2 diffs)

uspace/lib/block/libblock.c

@@ -294 +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;
@@ -436 +438 @@
                         if (!b->data) {
                                 free(b);
+                                b = NULL;
                                 goto recycle;
                         }
@@ -563 +566 @@
         assert(devcon);
         assert(devcon->cache);
+        assert(block->refcnt >= 1);
 
         cache = devcon->cache;
@@ -622 +626 @@
                         unsigned long key = block->lba;
                         hash_table_remove(&cache->block_hash, &key, 1);
+                        free(block->data);
                         free(block);
-                        free(block->data);
                         cache->blocks_cached--;
                         fibril_mutex_unlock(&cache->lock);

uspace/lib/c/generic/async.c

@@ -294 +294 @@
 }
 
-/** Connection hash table removal callback function.
- *
- * This function is called whenever a connection is removed from the connection
- * hash table.
- *
- * @param item Connection hash table item being removed.
- *
- */
 static void conn_remove(link_t *item)
 {
-        free(hash_table_get_instance(item, connection_t, link));
 }
 
@@ -647 +638 @@
                 ipc_answer_0(FIBRIL_connection->close_callid, EOK);
         
+        free(FIBRIL_connection);
         return 0;
 }