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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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.

File:

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

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

@@ -42 +42 @@
 #define FS_NAME_MAXLEN  20
 #define MAX_PATH_LEN    (64 * 1024)
+#define MAX_MNTOPTS_LEN 256
 #define PLB_SIZE        (2 * MAX_PATH_LEN)
 
@@ -56 +57 @@
         /** Unique identifier of the fs. */
         char name[FS_NAME_MAXLEN + 1];
+        unsigned int instance;
         bool concurrent_read_write;
         bool write_retains_size;
@@ -62 +64 @@
 typedef enum {
         VFS_IN_OPEN = IPC_FIRST_USER_METHOD,
-        VFS_IN_OPEN_NODE,
         VFS_IN_READ,
         VFS_IN_WRITE,
@@ -69 +70 @@
         VFS_IN_FSTAT,
         VFS_IN_CLOSE,
+        VFS_IN_PING,
         VFS_IN_MOUNT,
         VFS_IN_UNMOUNT,
@@ -77 +79 @@
         VFS_IN_RENAME,
         VFS_IN_STAT,
-        VFS_IN_DUP
+        VFS_IN_DUP,
+        VFS_IN_WAIT_HANDLE,
+        VFS_IN_MTAB_GET,
 } vfs_in_request_t;