Changes in uspace/srv/vfs/vfs.h [e2ab36f1:79ae36dd] in mainline

File:

• uspace/srv/vfs/vfs.h (modified) (11 diffs)

uspace/srv/vfs/vfs.h

@@ -38 +38 @@
 #include <fibril_synch.h>
 #include <sys/types.h>
-#include <loc.h>
+#include <devmap.h>
 #include <bool.h>
 #include <ipc/vfs.h>
-#include <task.h>
 
 #ifndef dprintf
@@ -62 +61 @@
 #define VFS_PAIR \
         fs_handle_t fs_handle; \
-        service_id_t service_id;
+        devmap_handle_t devmap_handle;
 
 /**
@@ -68 +67 @@
  * doesn't contain any state. For a stateful structure, see vfs_node_t.
  *
- * @note        fs_handle, service_id and index are meant to be returned in one
+ * @note        fs_handle, devmap_handle and index are meant to be returned in one
  *              IPC reply.
  */
@@ -146 +145 @@
 extern fibril_mutex_t nodes_mutex;
 
-extern fibril_condvar_t fs_list_cv;
-extern fibril_mutex_t fs_list_lock;
-extern list_t fs_list;          /**< List of registered file systems. */
+extern fibril_condvar_t fs_head_cv;
+extern fibril_mutex_t fs_head_lock;
+extern link_t fs_head;          /**< List of registered file systems. */
 
 extern vfs_pair_t rootfs;       /**< Root file system. */
@@ -159 +158 @@
 } plb_entry_t;
 
-extern fibril_mutex_t plb_mutex;/**< Mutex protecting plb and plb_entries. */
+extern fibril_mutex_t plb_mutex;/**< Mutex protecting plb and plb_head. */
 extern uint8_t *plb;            /**< Path Lookup Buffer */
-extern list_t plb_entries;      /**< List of active PLB entries. */
+extern link_t plb_head;         /**< List of active PLB entries. */
 
 #define MAX_MNTOPTS_LEN         256
@@ -176 +175 @@
 extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *,
     vfs_pair_t *, ...);
+extern int vfs_open_node_internal(vfs_lookup_res_t *);
 
 extern bool vfs_nodes_init(void);
@@ -181 +181 @@
 extern void vfs_node_put(vfs_node_t *);
 extern void vfs_node_forget(vfs_node_t *);
-extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, service_id_t);
+extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, devmap_handle_t);
 
 
@@ -188 +188 @@
 extern void *vfs_client_data_create(void);
 extern void vfs_client_data_destroy(void *);
-
-extern void vfs_pass_handle(task_id_t, task_id_t, int);
-extern int vfs_wait_handle_internal(void);
 
 extern vfs_file_t *vfs_file_get(int);
@@ -200 +197 @@
 extern void vfs_node_addref(vfs_node_t *);
 extern void vfs_node_delref(vfs_node_t *);
-extern int vfs_open_node_remote(vfs_node_t *);
 
 extern void vfs_register(ipc_callid_t, ipc_call_t *);
@@ -206 +202 @@
 extern void vfs_unmount(ipc_callid_t, ipc_call_t *);
 extern void vfs_open(ipc_callid_t, ipc_call_t *);
+extern void vfs_open_node(ipc_callid_t, ipc_call_t *);
 extern void vfs_sync(ipc_callid_t, ipc_call_t *);
 extern void vfs_dup(ipc_callid_t, ipc_call_t *);
@@ -218 +215 @@
 extern void vfs_unlink(ipc_callid_t, ipc_call_t *);
 extern void vfs_rename(ipc_callid_t, ipc_call_t *);
-extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *);
 
 #endif