Changeset b79d450 in mainline for uspace/srv/fs/tmpfs/tmpfs_ops.c

Timestamp:

2010-01-27T20:35:49Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (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/srv/fs/tmpfs/tmpfs_ops.c (modified) (13 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -147 +147 @@
 hash_table_t nodes;
 
-#define NODES_KEY_INDEX 0
-#define NODES_KEY_DEV   1
+#define NODES_KEY_DEV   0       
+#define NODES_KEY_INDEX 1
 
 /* Implementation of hash table interface for the nodes hash table. */
@@ -160 +160 @@
         tmpfs_node_t *nodep = hash_table_get_instance(item, tmpfs_node_t,
             nh_link);
-        return (nodep->index == key[NODES_KEY_INDEX] &&
-            nodep->dev_handle == key[NODES_KEY_DEV]);
+        
+        switch (keys) {
+        case 1:
+                return (nodep->dev_handle == key[NODES_KEY_DEV]);
+        case 2: 
+                return ((nodep->dev_handle == key[NODES_KEY_DEV]) &&
+                    (nodep->index == key[NODES_KEY_INDEX]));
+        default:
+                abort();
+        }
 }
 
 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);
 }
 
@@ -215 +241 @@
 }
 
+static void tmpfs_instance_done(dev_handle_t dev_handle)
+{
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = dev_handle
+        };
+        /*
+         * Here we are making use of one special feature of our hash table
+         * implementation, which allows to remove more items based on a partial
+         * key match. In the following, we are going to remove all nodes
+         * matching our device handle. The nodes_remove_callback() function will
+         * take care of resource deallocation.
+         */
+        hash_table_remove(&nodes, key, 1);
+}
+
 int tmpfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)
 {
@@ -237 +278 @@
 {
         unsigned long key[] = {
-                [NODES_KEY_INDEX] = index,
-                [NODES_KEY_DEV] = dev_handle
+                [NODES_KEY_DEV] = dev_handle,
+                [NODES_KEY_INDEX] = index
         };
         link_t *lnk = hash_table_find(&nodes, key);
@@ -296 +337 @@
         /* Insert the new node into the nodes hash table. */
         unsigned long key[] = {
-                [NODES_KEY_INDEX] = nodep->index,
-                [NODES_KEY_DEV] = nodep->dev_handle
+                [NODES_KEY_DEV] = nodep->dev_handle,
+                [NODES_KEY_INDEX] = nodep->index
         };
         hash_table_insert(&nodes, key, &nodep->nh_link);
@@ -312 +353 @@
 
         unsigned long key[] = {
-                [NODES_KEY_INDEX] = nodep->index,
-                [NODES_KEY_DEV] = nodep->dev_handle
+                [NODES_KEY_DEV] = nodep->dev_handle,
+                [NODES_KEY_INDEX] = nodep->index
         };
         hash_table_remove(&nodes, key, 2);
 
-        if (nodep->type == TMPFS_FILE)
-                free(nodep->data);
-        free(nodep->bp);
-        free(nodep);
+        /*
+         * The nodes_remove_callback() function takes care of the actual
+         * resource deallocation.
+         */
         return EOK;
 }
@@ -424 +465 @@
         /* Initialize TMPFS instance. */
         if (!tmpfs_instance_init(dev_handle)) {
+                free(opts);
                 ipc_answer_0(rid, ENOMEM);
                 return;
@@ -442 +484 @@
                     rootp->lnkcnt);
         }
+        free(opts);
 }
 
@@ -447 +490 @@
 {
         libfs_mount(&tmpfs_libfs_ops, tmpfs_reg.fs_handle, rid, request);
+}
+
+void tmpfs_unmounted(ipc_callid_t rid, ipc_call_t *request)
+{
+        dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+
+        tmpfs_instance_done(dev_handle);
+        ipc_answer_0(rid, EOK);
+}
+
+void tmpfs_unmount(ipc_callid_t rid, ipc_call_t *request)
+{
+        libfs_unmount(&tmpfs_libfs_ops, rid, request);
 }
 
@@ -465 +521 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_INDEX] = index,
                 [NODES_KEY_DEV] = dev_handle,
+                [NODES_KEY_INDEX] = index
         };
         hlp = hash_table_find(&nodes, key);
@@ -539 +595 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_INDEX] = index,
-                [NODES_KEY_DEV] = dev_handle
+                [NODES_KEY_DEV] = dev_handle,
+                [NODES_KEY_INDEX] = index
         };
         hlp = hash_table_find(&nodes, key);
@@ -603 +659 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_INDEX] = index,
-                [NODES_KEY_DEV] = dev_handle
+                [NODES_KEY_DEV] = dev_handle,
+                [NODES_KEY_INDEX] = index
         };
         hlp = hash_table_find(&nodes, key);
@@ -646 +702 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_INDEX] = index,
-                [NODES_KEY_DEV] = dev_handle
+                [NODES_KEY_DEV] = dev_handle,
+                [NODES_KEY_INDEX] = index
         };
         hlp = hash_table_find(&nodes, key);