Changeset 1dff985 in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2017-03-03T21:32:38Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c577a9a

Parents:

5b46ec8 (diff), b8dbe2f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5 up to revision 1926

File:

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

uspace/srv/vfs/vfs.h

@@ -94 +94 @@
         vfs_node_type_t type;
         aoff64_t size;
-        unsigned int lnkcnt;
 } vfs_lookup_res_t;
 
@@ -101 +100 @@
  * which may be associated with it.
  */
-typedef struct {
+typedef struct _vfs_node {
         VFS_TRIPLET;            /**< Identity of the node. */
 
@@ -110 +109 @@
         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. */
 
-        aoff64_t size;          /**< Cached size if the node is a file. */
+        int64_t size;           /**< Cached size if the node is a file. */
 
         /**
@@ -123 +119 @@
          */
         fibril_rwlock_t contents_rwlock;
+        
+        struct _vfs_node *mount;
 } vfs_node_t;
 
@@ -138 +136 @@
         unsigned refcnt;
 
+        int permissions;
+        bool open_read;
+        bool open_write;
+
         /** Append on write. */
         bool append;
@@ -176 +178 @@
 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_lookup_internal(vfs_node_t *, char *, int, vfs_lookup_res_t *);
+extern int vfs_link_internal(vfs_node_t *, char *, vfs_triplet_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
@@ -207 +212 @@
 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 *);
@@ -216 +220 @@
 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 *);
@@ -233 +234 @@
 extern int vfs_rdwr_internal(int, bool, rdwr_io_chunk_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 *);
+
 #endif