Changeset 368ee04 in mainline for uspace/lib/c/include/ipc/vfs.h

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/lib/c/include/ipc/vfs.h (modified) (4 diffs)

uspace/lib/c/include/ipc/vfs.h

@@ -41 +41 @@
 
 #define FS_NAME_MAXLEN  20
-#define MAX_PATH_LEN    (64 * 1024)
+#define MAX_PATH_LEN    (32 * 1024)
 #define MAX_MNTOPTS_LEN 256
 #define PLB_SIZE        (2 * MAX_PATH_LEN)
@@ -63 +63 @@
 
 typedef enum {
-        VFS_IN_OPEN = IPC_FIRST_USER_METHOD,
+        VFS_IN_CLONE = IPC_FIRST_USER_METHOD,
+        VFS_IN_MOUNT,
+        VFS_IN_OPEN,
+        VFS_IN_PUT,
         VFS_IN_READ,
+        VFS_IN_REGISTER,
+        VFS_IN_RENAME,
+        VFS_IN_RESIZE,
+        VFS_IN_STAT,
+        VFS_IN_STATFS,
+        VFS_IN_SYNC,
+        VFS_IN_UNLINK,
+        VFS_IN_UNMOUNT,
+        VFS_IN_WAIT_HANDLE,
+        VFS_IN_WALK,
         VFS_IN_WRITE,
-        VFS_IN_SEEK,
-        VFS_IN_TRUNCATE,
-        VFS_IN_FSTAT,
-        VFS_IN_CLOSE,
-        VFS_IN_PING,
-        VFS_IN_MOUNT,
-        VFS_IN_UNMOUNT,
-        VFS_IN_SYNC,
-        VFS_IN_REGISTER,
-        VFS_IN_MKDIR,
-        VFS_IN_UNLINK,
-        VFS_IN_RENAME,
-        VFS_IN_STAT,
-        VFS_IN_DUP,
-        VFS_IN_WAIT_HANDLE,
-        VFS_IN_MTAB_GET,
-        VFS_IN_STATFS
 } vfs_in_request_t;
 
 typedef enum {
-        VFS_OUT_OPEN_NODE = IPC_FIRST_USER_METHOD,
+        VFS_OUT_CLOSE = IPC_FIRST_USER_METHOD,
+        VFS_OUT_DESTROY,
+        VFS_OUT_IS_EMPTY,
+        VFS_OUT_LINK,
+        VFS_OUT_LOOKUP,
+        VFS_OUT_MOUNTED,
+        VFS_OUT_OPEN_NODE,
         VFS_OUT_READ,
+        VFS_OUT_STAT,
+        VFS_OUT_STATFS,
+        VFS_OUT_SYNC,
+        VFS_OUT_TRUNCATE,
+        VFS_OUT_UNMOUNTED,
         VFS_OUT_WRITE,
-        VFS_OUT_TRUNCATE,
-        VFS_OUT_CLOSE,
-        VFS_OUT_MOUNT,
-        VFS_OUT_MOUNTED,
-        VFS_OUT_UNMOUNT,
-        VFS_OUT_UNMOUNTED,
-        VFS_OUT_SYNC,
-        VFS_OUT_STAT,
-        VFS_OUT_LOOKUP,
-        VFS_OUT_DESTROY,
-        VFS_OUT_STATFS,
         VFS_OUT_LAST
 } vfs_out_request_t;
@@ -127 +123 @@
 
 /**
- * Lookup will succeed only if the object is a root directory. The flag is
- * mutually exclusive with L_FILE and L_MP.
+ * Lookup will not cross any mount points.
+ * If the lookup would have to cross a mount point, it returns EXDEV instead.
  */
-#define L_ROOT                  4
+#define L_DISABLE_MOUNTS        4
 
 /**
  * Lookup will succeed only if the object is a mount point. The flag is mutually
- * exclusive with L_FILE and L_ROOT.
+ * exclusive with L_FILE.
  */
 #define L_MP                    8
@@ -151 +147 @@
 
 /**
- * L_LINK is used for linking to an already existing nodes.
- */
-#define L_LINK                  64
-
-/**
  * L_UNLINK is used to remove leaves from the file system namespace. This flag
  * cannot be passed directly by the client, but will be set by VFS during
  * VFS_UNLINK.
  */
-#define L_UNLINK                128
+#define L_UNLINK                64
 
-/**
- * L_OPEN is used to indicate that the lookup operation is a part of VFS_IN_OPEN
- * call from the client. This means that the server might allocate some
- * resources for the opened file. This flag cannot be passed directly by the
- * client.
+/*
+ * Walk flags.
  */
-#define L_OPEN                  256
+enum {
+        WALK_MAY_CREATE = (1 << 0),
+        WALK_MUST_CREATE = (1 << 1),
+        
+        WALK_REGULAR = (1 << 2),
+        WALK_DIRECTORY = (1 << 3),
+        WALK_MOUNT_POINT = (1 << 4),
+        
+        WALK_ALL_FLAGS = WALK_MAY_CREATE | WALK_MUST_CREATE | WALK_REGULAR |
+            WALK_DIRECTORY | WALK_MOUNT_POINT,
+};
+
+enum {
+        VFS_MOUNT_BLOCKING = 1,
+        VFS_MOUNT_CONNECT_ONLY = 2,
+        VFS_MOUNT_NO_REF = 4,
+};
+
+enum {
+        MODE_READ = 1,
+        MODE_WRITE = 2,
+        MODE_APPEND = 4,
+};
 
 #endif