Changes in uspace/srv/fs/tmpfs/tmpfs_ops.c [4cac2d69:1313ee9] in mainline

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_DEV   0       
-#define NODES_KEY_INDEX 1
+#define NODES_KEY_INDEX 0
+#define NODES_KEY_DEV   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);
-        
-        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();
-        }
+        return (nodep->index == key[NODES_KEY_INDEX] &&
+            nodep->dev_handle == key[NODES_KEY_DEV]);
 }
 
 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);
 }
 
@@ -241 +215 @@
 }
 
-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)
 {
@@ -278 +237 @@
 {
         unsigned long key[] = {
-                [NODES_KEY_DEV] = dev_handle,
-                [NODES_KEY_INDEX] = index
+                [NODES_KEY_INDEX] = index,
+                [NODES_KEY_DEV] = dev_handle
         };
         link_t *lnk = hash_table_find(&nodes, key);
@@ -337 +296 @@
         /* Insert the new node into the nodes hash table. */
         unsigned long key[] = {
-                [NODES_KEY_DEV] = nodep->dev_handle,
-                [NODES_KEY_INDEX] = nodep->index
+                [NODES_KEY_INDEX] = nodep->index,
+                [NODES_KEY_DEV] = nodep->dev_handle
         };
         hash_table_insert(&nodes, key, &nodep->nh_link);
@@ -353 +312 @@
 
         unsigned long key[] = {
-                [NODES_KEY_DEV] = nodep->dev_handle,
-                [NODES_KEY_INDEX] = nodep->index
+                [NODES_KEY_INDEX] = nodep->index,
+                [NODES_KEY_DEV] = nodep->dev_handle
         };
         hash_table_remove(&nodes, key, 2);
 
-        /*
-         * The nodes_remove_callback() function takes care of the actual
-         * resource deallocation.
-         */
+        if (nodep->type == TMPFS_FILE)
+                free(nodep->data);
+        free(nodep->bp);
+        free(nodep);
         return EOK;
 }
@@ -439 +398 @@
 {
         dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-        
-        /* Accept the mount options */
-        char *opts;
-        int rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
-        
-        if (rc != EOK) {
-                ipc_answer_0(rid, rc);
-                return;
-        }
+        int rc;
+
+        /* accept the mount options */
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+        char *opts = malloc(size + 1);
+        if (!opts) {
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
+                return;
+        }
+        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
+        if (retval != EOK) {
+                ipc_answer_0(rid, retval);
+                free(opts);
+                return;
+        }
+        opts[size] = '\0';
 
         /* Initialize TMPFS instance. */
         if (!tmpfs_instance_init(dev_handle)) {
-                free(opts);
                 ipc_answer_0(rid, ENOMEM);
                 return;
@@ -470 +442 @@
                     rootp->lnkcnt);
         }
-        free(opts);
 }
 
@@ -476 +447 @@
 {
         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);
 }
 
@@ -507 +465 @@
         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);
@@ -581 +539 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_DEV] = dev_handle,
-                [NODES_KEY_INDEX] = index
+                [NODES_KEY_INDEX] = index,
+                [NODES_KEY_DEV] = dev_handle
         };
         hlp = hash_table_find(&nodes, key);
@@ -645 +603 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_DEV] = dev_handle,
-                [NODES_KEY_INDEX] = index
+                [NODES_KEY_INDEX] = index,
+                [NODES_KEY_DEV] = dev_handle
         };
         hlp = hash_table_find(&nodes, key);
@@ -688 +646 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_DEV] = dev_handle,
-                [NODES_KEY_INDEX] = index
+                [NODES_KEY_INDEX] = index,
+                [NODES_KEY_DEV] = dev_handle
         };
         hlp = hash_table_find(&nodes, key);