Changes in uspace/srv/vfs/vfs.h [ffa2c8ef:df908b3] in mainline

File:

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

uspace/srv/vfs/vfs.h

@@ -34 +34 @@
 #define VFS_VFS_H_
 
-#include <async.h>
+#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <fibril_synch.h>
@@ -53 +53 @@
         vfs_info_t vfs_info;
         fs_handle_t fs_handle;
-        async_sess_t session;
+        fibril_mutex_t phone_lock;
+        ipcarg_t phone;
 } fs_info_t;
 
@@ -61 +62 @@
 #define VFS_PAIR \
         fs_handle_t fs_handle; \
-        devmap_handle_t devmap_handle;
+        dev_handle_t dev_handle;
 
 /**
@@ -67 +68 @@
  * doesn't contain any state. For a stateful structure, see vfs_node_t.
  *
- * @note        fs_handle, devmap_handle and index are meant to be returned in one
+ * @note        fs_handle, dev_handle and index are meant to be returned in one
  *              IPC reply.
  */
@@ -171 +172 @@
 
 extern fs_handle_t fs_name_to_handle(char *, bool);
-extern vfs_info_t *fs_handle_to_info(fs_handle_t);
 
 extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *,
@@ -182 +182 @@
 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, devmap_handle_t);
+extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, dev_handle_t);
 
 
 #define MAX_OPEN_FILES  128
 
-extern void *vfs_client_data_create(void);
-extern void vfs_client_data_destroy(void *);
-
+extern bool vfs_files_init(void);
+extern void vfs_files_done(void);
 extern vfs_file_t *vfs_file_get(int);
-extern void vfs_file_put(vfs_file_t *);
-extern int vfs_fd_assign(vfs_file_t *, int);
+extern int vfs_fd_assign(vfs_file_t *file, int fd);
 extern int vfs_fd_alloc(bool desc);
 extern int vfs_fd_free(int);
+
+extern void vfs_file_addref(vfs_file_t *);
+extern void vfs_file_delref(vfs_file_t *);
 
 extern void vfs_node_addref(vfs_node_t *);