Changeset f17667a in mainline for uspace/srv/vfs

Timestamp:

2008-02-17T13:32:53Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2616965d

Parents:

b5553a2

Message:

Add the VFS_FREE operation. This operation frees up whatever resources used by
a file system node for which there is no name (i.e. an unlinked node).

Cleanup VFS operations enums and remove unneeded VFS operations.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (3 diffs)
• vfs_file.c (modified) (1 diff)
• vfs_node.c (modified) (4 diffs)
• vfs_register.c (modified) (1 diff)

uspace/srv/vfs/vfs.h

@@ -48 +48 @@
 
 typedef enum {
-        VFS_OPEN = VFS_FIRST,
-        VFS_CLOSE,
-        VFS_READ,
+        VFS_READ = VFS_FIRST,
         VFS_WRITE,
         VFS_TRUNCATE,
-        VFS_RENAME,
-        VFS_OPENDIR,
-        VFS_READDIR,
-        VFS_CLOSEDIR,
-        VFS_MKDIR,
-        VFS_UNLINK,
         VFS_MOUNT,
         VFS_UNMOUNT,
@@ -66 +58 @@
 typedef enum {
         VFS_LOOKUP = VFS_LAST_CMN,
+        VFS_FREE,
         VFS_LAST_CLNT,  /* keep this the last member of this enum */
 } vfs_request_clnt_t;
@@ -71 +64 @@
 typedef enum {
         VFS_REGISTER = VFS_LAST_CMN,
+        VFS_OPEN,
+        VFS_CLOSE,
         VFS_SEEK,
+        VFS_MKDIR,
+        VFS_UNLINK,
+        VFS_RENAME,
         VFS_LAST_SRV,   /* keep this the last member of this enum */
 } vfs_request_srv_t;

uspace/srv/vfs/vfs_file.c

@@ -131 +131 @@
         if (file->refcnt-- == 1) {
                 /*
-                 * Lost last reference to a file, need to drop our reference
+                 * Lost the last reference to a file, need to drop our reference
                  * to the underlying VFS node.
                  */

uspace/srv/vfs/vfs_node.c

@@ -44 +44 @@
 #include <libadt/hash_table.h>
 #include <assert.h>
+#include <async.h>
+#include <errno.h>
 
 /** Futex protecting the VFS node hash table. */
@@ -102 +104 @@
 void vfs_node_delref(vfs_node_t *node)
 {
+        bool free_vfs_node = false;
+        bool free_fs_node = false;
+
         futex_down(&nodes_futex);
         if (node->refcnt-- == 1) {
+                /*
+                 * We are dropping the last reference to this node.
+                 * Remove it from the VFS node hash table.
+                 */
                 unsigned long key[] = {
                         [KEY_FS_HANDLE] = node->fs_handle,
@@ -110 +119 @@
                 };
                 hash_table_remove(&nodes, key, 3);
+                free_vfs_node = true;
+                if (!node->lnkcnt)
+                        free_fs_node = true;
         }
         futex_up(&nodes_futex);
+
+        if (free_fs_node) {
+                /* 
+                 * The node is not visible in the file system namespace.
+                 * Free up its resources.
+                 */
+                int phone = vfs_grab_phone(node->fs_handle);
+                ipcarg_t rc;
+                rc = async_req_2_0(phone, VFS_FREE, (ipcarg_t)node->dev_handle,
+                    (ipcarg_t)node->index);
+                assert(rc == EOK);
+                vfs_release_phone(phone);
+        }
+        if (free_vfs_node)
+                free(node);
 }
 
@@ -197 +224 @@
 void nodes_remove_callback(link_t *item)
 {
-        vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
-        free(node);
 }
 

uspace/srv/vfs/vfs_register.c

@@ -105 +105 @@
         if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] != VFS_OP_DEFINED) {
                 dprintf("Operation VFS_LOOKUP not defined by the client.\n");
-                return false;
-        }
-        if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_OPEN)] != VFS_OP_DEFINED) {
-                dprintf("Operation VFS_OPEN not defined by the client.\n");
-                return false;
-        }
-        if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_CLOSE)] != VFS_OP_DEFINED) {
-                dprintf("Operation VFS_CLOSE not defined by the client.\n");
                 return false;
         }