Changes in uspace/srv/vfs/vfs.h [5bcd5b7:c1f7a315] in mainline

File:

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

uspace/srv/vfs/vfs.h

@@ -94 +94 @@
         vfs_node_type_t type;
         aoff64_t size;
+        unsigned int lnkcnt;
 } vfs_lookup_res_t;
 
@@ -100 +101 @@
  * which may be associated with it.
  */
-typedef struct _vfs_node {
+typedef struct {
         VFS_TRIPLET;            /**< Identity of the node. */
 
@@ -109 +110 @@
         unsigned refcnt;
         
+        /** Number of names this node has in the file system namespace. */
+        unsigned lnkcnt;
+
         ht_link_t nh_link;              /**< Node hash-table link. */
 
         vfs_node_type_t type;   /**< Partial info about the node type. */
 
-        int64_t size;           /**< Cached size if the node is a file. */
+        aoff64_t size;          /**< Cached size if the node is a file. */
 
         /**
@@ -119 +123 @@
          */
         fibril_rwlock_t contents_rwlock;
-        
-        struct _vfs_node *mount;
 } vfs_node_t;
 
@@ -136 +138 @@
         unsigned refcnt;
 
-        int permissions;
-        bool open_read;
-        bool open_write;
-
         /** Append on write. */
         bool append;
@@ -178 +176 @@
 extern vfs_info_t *fs_handle_to_info(fs_handle_t);
 
-extern int vfs_lookup_internal(vfs_node_t *, char *, int, vfs_lookup_res_t *);
-extern int vfs_link_internal(vfs_node_t *, char *, vfs_triplet_t *);
+extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *,
+    vfs_pair_t *, ...);
 
 extern bool vfs_nodes_init(void);
 extern vfs_node_t *vfs_node_get(vfs_lookup_res_t *);
-extern vfs_node_t *vfs_node_peek(vfs_lookup_res_t *result);
 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 int64_t vfs_node_get_size(vfs_node_t *node);
-extern bool vfs_node_has_children(vfs_node_t *node);
 
 #define MAX_OPEN_FILES  128
@@ -210 +205 @@
 
 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_mount_srv(ipc_callid_t, ipc_call_t *);
+extern void vfs_unmount_srv(ipc_callid_t, ipc_call_t *);
+extern void vfs_open(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 *);
@@ -220 +216 @@
 extern void vfs_truncate(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 *);
+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 *);
 extern void vfs_get_mtab(ipc_callid_t, ipc_call_t *);
-
-extern void vfs_walk(ipc_callid_t, ipc_call_t *);
-extern void vfs_open2(ipc_callid_t, ipc_call_t *);
-extern void vfs_unlink2(ipc_callid_t, ipc_call_t *);
+extern void vfs_statfs(ipc_callid_t, ipc_call_t *);
+
+extern void vfs_page_in(ipc_callid_t, ipc_call_t *);
+
+typedef struct {
+        void *buffer;
+        size_t size;
+} rdwr_io_chunk_t;
+
+extern int vfs_rdwr_internal(int, bool, rdwr_io_chunk_t *);
 
 #endif