Changes in uspace/srv/vfs/vfs_node.c [96b02eb9:8b58fc1] in mainline

File:

• uspace/srv/vfs/vfs_node.c (modified) (7 diffs)

uspace/srv/vfs/vfs_node.c

@@ -38 +38 @@
 #include "vfs.h"
 #include <stdlib.h>
-#include <str.h>
-#include <fibril_synch.h>
+#include <string.h>
+#include <fibril_sync.h>
 #include <adt/hash_table.h>
 #include <assert.h>
@@ -113 +113 @@
                 unsigned long key[] = {
                         [KEY_FS_HANDLE] = node->fs_handle,
-                        [KEY_DEV_HANDLE] = node->devmap_handle,
+                        [KEY_DEV_HANDLE] = node->dev_handle,
                         [KEY_INDEX] = node->index
                 };
@@ -129 +129 @@
                  */
                 int phone = vfs_grab_phone(node->fs_handle);
-                sysarg_t rc;
+                ipcarg_t rc;
                 rc = async_req_2_0(phone, VFS_OUT_DESTROY,
-                    (sysarg_t)node->devmap_handle, (sysarg_t)node->index);
+                    (ipcarg_t)node->dev_handle, (ipcarg_t)node->index);
                 assert(rc == EOK);
-                vfs_release_phone(node->fs_handle, phone);
+                vfs_release_phone(phone);
         }
         if (free_vfs_node)
                 free(node);
-}
-
-/** Forget node.
- *
- * This function will remove the node from the node hash table and deallocate
- * its memory, regardless of the node's reference count.
- *
- * @param node  Node to be forgotten.
- */
-void vfs_node_forget(vfs_node_t *node)
-{
-        fibril_mutex_lock(&nodes_mutex);
-        unsigned long key[] = {
-                [KEY_FS_HANDLE] = node->fs_handle,
-                [KEY_DEV_HANDLE] = node->devmap_handle,
-                [KEY_INDEX] = node->index
-        };
-        hash_table_remove(&nodes, key, 3);
-        fibril_mutex_unlock(&nodes_mutex);
-        free(node);
 }
 
@@ -175 +155 @@
         unsigned long key[] = {
                 [KEY_FS_HANDLE] = result->triplet.fs_handle,
-                [KEY_DEV_HANDLE] = result->triplet.devmap_handle,
+                [KEY_DEV_HANDLE] = result->triplet.dev_handle,
                 [KEY_INDEX] = result->triplet.index
         };
@@ -191 +171 @@
                 memset(node, 0, sizeof(vfs_node_t));
                 node->fs_handle = result->triplet.fs_handle;
-                node->devmap_handle = result->triplet.devmap_handle;
+                node->dev_handle = result->triplet.dev_handle;
                 node->index = result->triplet.index;
                 node->size = result->size;
@@ -242 +222 @@
 {
         vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
-        return (node->fs_handle == (fs_handle_t) key[KEY_FS_HANDLE]) &&
-            (node->devmap_handle == key[KEY_DEV_HANDLE]) &&
+        return (node->fs_handle == key[KEY_FS_HANDLE]) &&
+            (node->dev_handle == key[KEY_DEV_HANDLE]) &&
             (node->index == key[KEY_INDEX]);
 }
@@ -249 +229 @@
 void nodes_remove_callback(link_t *item)
 {
-}
-
-struct refcnt_data {
-        /** Sum of all reference counts for this file system instance. */
-        unsigned refcnt;
-        fs_handle_t fs_handle;
-        devmap_handle_t devmap_handle;
-};
-
-static void refcnt_visitor(link_t *item, void *arg)
-{
-        vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
-        struct refcnt_data *rd = (void *) arg;
-
-        if ((node->fs_handle == rd->fs_handle) &&
-            (node->devmap_handle == rd->devmap_handle))
-                rd->refcnt += node->refcnt;
-}
-
-unsigned
-vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, devmap_handle_t devmap_handle)
-{
-        struct refcnt_data rd = {
-                .refcnt = 0,
-                .fs_handle = fs_handle,
-                .devmap_handle = devmap_handle
-        };
-
-        fibril_mutex_lock(&nodes_mutex);
-        hash_table_apply(&nodes, refcnt_visitor, &rd);
-        fibril_mutex_unlock(&nodes_mutex);
-
-        return rd.refcnt;
 }