Changeset 04803bf in mainline for uspace/lib/c/include/ipc/vfs.h

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 mainline changes (needs fixes).

File:

• uspace/lib/c/include/ipc/vfs.h (moved) (moved from uspace/lib/libc/include/ipc/vfs.h ) (8 diffs)

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

@@ -36 +36 @@
 #define LIBC_IPC_VFS_H_
 
+#include <ipc/common.h>
 #include <sys/types.h>
-#include <ipc/ipc.h>
+#include <bool.h>
 
 #define FS_NAME_MAXLEN  20
@@ -55 +56 @@
         /** Unique identifier of the fs. */
         char name[FS_NAME_MAXLEN + 1];
+        bool concurrent_read_write;
+        bool write_retains_size;
 } vfs_info_t;
 
@@ -73 +76 @@
         VFS_IN_UNLINK,
         VFS_IN_RENAME,
-        VFS_IN_STAT
+        VFS_IN_STAT,
+        VFS_IN_DUP
 } vfs_in_request_t;
 
@@ -85 +89 @@
         VFS_OUT_MOUNTED,
         VFS_OUT_UNMOUNT,
+        VFS_OUT_UNMOUNTED,
         VFS_OUT_SYNC,
         VFS_OUT_STAT,
@@ -99 +104 @@
  * No lookup flags used.
  */
-#define L_NONE  0
+#define L_NONE                  0
 
 /**
@@ -106 +111 @@
  * with L_DIRECTORY.
  */
-#define L_FILE  1
+#define L_FILE                  1
 
 /**
- * Lookup wil succeed only if the object is a directory. If L_CREATE is
+ * Lookup will succeed only if the object is a directory. If L_CREATE is
  * specified, an empty directory will be created. This flag is mutually
  * exclusive with L_FILE.
  */
-#define L_DIRECTORY  2
+#define L_DIRECTORY             2
+
+/**
+ * Lookup will succeed only if the object is a root directory. The flag is
+ * mutually exclusive with L_FILE and L_MP.
+ */
+#define L_ROOT                  4
+
+/**
+ * Lookup will succeed only if the object is a mount point. The flag is mutually
+ * exclusive with L_FILE and L_ROOT.
+ */
+#define L_MP                    8
+
 
 /**
@@ -119 +137 @@
  * object already exists. L_EXCLUSIVE is implied when L_DIRECTORY is used.
  */
-#define L_EXCLUSIVE  4
+#define L_EXCLUSIVE             16
 
 /**
  * L_CREATE is used for creating both regular files and directories.
  */
-#define L_CREATE  8
+#define L_CREATE                32
 
 /**
  * L_LINK is used for linking to an already existing nodes.
  */
-#define L_LINK  16
+#define L_LINK                  64
 
 /**
@@ -136 +154 @@
  * VFS_UNLINK.
  */
-#define L_UNLINK  32
+#define L_UNLINK                128
 
 /**
- * L_OPEN is used to indicate that the lookup operation is a part of VFS_OPEN
+ * 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.
  */
-#define L_OPEN  64
+#define L_OPEN                  256
 
 #endif