Changeset e950803 in mainline

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bfe43d5

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

Files:

• lib/block/libblock.c (modified) (4 diffs)
• lib/c/generic/async.c (modified) (2 diffs)
• srv/devman/devman.c (modified) (1 diff)
• srv/devmap/devmap.c (modified) (3 diffs)
• srv/fs/devfs/devfs_ops.c (modified) (4 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;
 }

uspace/srv/devman/devman.c

@@ -1063 +1063 @@
         if (info != NULL) {
                 memset(info, 0, sizeof(dev_class_info_t));
-                list_initialize(&info->dev_classes);
-                list_initialize(&info->devmap_link);
-                list_initialize(&info->link);
+                link_initialize(&info->dev_classes);
+                link_initialize(&info->devmap_link);
+                link_initialize(&info->link);
         }
         

uspace/srv/devmap/devmap.c

@@ -423 +423 @@
          */
         list_initialize(&driver->devices);
-        list_initialize(&(driver->drivers));
+
+        link_initialize(&driver->drivers);
         
         fibril_mutex_lock(&drivers_list_mutex);
@@ -538 +539 @@
         }
         
-        list_initialize(&(device->devices));
-        list_initialize(&(device->driver_devices));
+        link_initialize(&device->devices);
+        link_initialize(&device->driver_devices);
         
         /* Check that device is not already registered */
@@ -942 +943 @@
         }
         
-        list_initialize(&(device->devices));
-        list_initialize(&(device->driver_devices));
+        link_initialize(&device->devices);
+        link_initialize(&device->driver_devices);
         
         /* Get unique device handle */

uspace/srv/fs/devfs/devfs_ops.c

@@ -130 +130 @@
 {
         devfs_node_t *node = (devfs_node_t *) pfn->data;
+        int ret;
         
         if (node->handle == 0) {
@@ -145 +146 @@
                                 
                                 if (str_cmp(devs[pos].name, component) == 0) {
+                                        ret = devfs_node_get_internal(rfn, DEV_HANDLE_NAMESPACE, devs[pos].handle);
                                         free(devs);
-                                        return devfs_node_get_internal(rfn, DEV_HANDLE_NAMESPACE, devs[pos].handle);
+                                        return ret;
                                 }
                         }
@@ -162 +164 @@
                                 for (pos = 0; pos < count; pos++) {
                                         if (str_cmp(devs[pos].name, component) == 0) {
+                                                ret = devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
                                                 free(devs);
-                                                return devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
+                                                return ret;
                                         }
                                 }
@@ -184 +187 @@
                         for (pos = 0; pos < count; pos++) {
                                 if (str_cmp(devs[pos].name, component) == 0) {
+                                        ret = devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
                                         free(devs);
-                                        return devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
+                                        return ret;
                                 }
                         }