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

File:

• uspace/srv/vfs/vfs.h (modified) (11 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>
+#include <fibril_sync.h>
 #include <sys/types.h>
 #include <devmap.h>
@@ -42 +42 @@
 #include <ipc/vfs.h>
 
-#ifndef dprintf
-        #define dprintf(...)
-#endif
+// FIXME: according to CONFIG_DEBUG
+// #define dprintf(...)  printf(__VA_ARGS__)
+
+#define dprintf(...)
 
 /**
@@ -53 +54 @@
         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 +63 @@
 #define VFS_PAIR \
         fs_handle_t fs_handle; \
-        devmap_handle_t devmap_handle;
+        dev_handle_t dev_handle;
 
 /**
@@ -67 +69 @@
  * 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.
  */
@@ -91 +93 @@
         vfs_triplet_t triplet;
         vfs_node_type_t type;
-        aoff64_t size;
-        unsigned int lnkcnt;
+        size_t size;
+        unsigned lnkcnt;
 } vfs_lookup_res_t;
 
@@ -115 +117 @@
         vfs_node_type_t type;   /**< Partial info about the node type. */
 
-        aoff64_t size;          /**< Cached size if the node is a file. */
+        size_t size;            /**< Cached size if the node is a file. */
 
         /**
@@ -139 +141 @@
         bool append;
 
-        /** Current absolute position in the file. */
-        aoff64_t pos;
+        /** Current position in the file. */
+        off_t pos;
 } vfs_file_t;
 
@@ -168 +170 @@
 
 extern int vfs_grab_phone(fs_handle_t);
-extern void vfs_release_phone(fs_handle_t, int);
+extern void vfs_release_phone(int);
 
 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 *,
     vfs_pair_t *, ...);
 extern int vfs_open_node_internal(vfs_lookup_res_t *);
-extern int vfs_close_internal(vfs_file_t *);
 
 extern bool vfs_nodes_init(void);
 extern vfs_node_t *vfs_node_get(vfs_lookup_res_t *);
 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);
-
 
 #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 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_alloc(bool desc);
+extern int vfs_fd_alloc(void);
 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 *);
@@ -201 +197 @@
 extern void vfs_register(ipc_callid_t, ipc_call_t *);
 extern void vfs_mount(ipc_callid_t, ipc_call_t *);
-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 *);
 extern void vfs_close(ipc_callid_t, ipc_call_t *);
 extern void vfs_read(ipc_callid_t, ipc_call_t *);
@@ -212 +206 @@
 extern void vfs_truncate(ipc_callid_t, ipc_call_t *);
 extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
+extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
 extern void vfs_stat(ipc_callid_t, ipc_call_t *);
 extern void vfs_mkdir(ipc_callid_t, ipc_call_t *);