Changeset 9bddf37 in mainline

Timestamp:

2010-01-26T19:03:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e056e820

Parents:

88e870e

Message:

Free up node's resources in the 'nodes' hash table remove callback.

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (2 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -166 +166 @@
 static void nodes_remove_callback(link_t *item)
 {
+        tmpfs_node_t *nodep = hash_table_get_instance(item, tmpfs_node_t,
+            nh_link);
+
+        while (!list_empty(&nodep->cs_head)) {
+                tmpfs_dentry_t *dentryp = list_get_instance(nodep->cs_head.next,
+                    tmpfs_dentry_t, link);
+
+                assert(nodep->type == TMPFS_DIRECTORY);
+                list_remove(&dentryp->link);
+                free(dentryp);
+        }
+
+        if (nodep->data) {
+                assert(nodep->type == TMPFS_FILE);
+                free(nodep->data);
+        }
+        free(nodep->bp);
+        free(nodep);
 }
 
@@ -317 +335 @@
         hash_table_remove(&nodes, key, 2);
 
-        if ((nodep->type == TMPFS_FILE) && (nodep->data))
-                free(nodep->data);
-        free(nodep->bp);
-        free(nodep);
+        /*
+         * The nodes_remove_callback() function takes care of the actual
+         * resource deallocation.
+         */
         return EOK;
 }