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

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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) (3 diffs)

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

@@ -56 +56 @@
         /** Unique identifier of the fs. */
         char name[FS_NAME_MAXLEN + 1];
+        unsigned int instance;
         bool concurrent_read_write;
         bool write_retains_size;
@@ -62 +63 @@
 typedef enum {
         VFS_IN_OPEN = IPC_FIRST_USER_METHOD,
-        VFS_IN_OPEN_NODE,
         VFS_IN_READ,
         VFS_IN_WRITE,
@@ -78 +78 @@
         VFS_IN_RENAME,
         VFS_IN_STAT,
-        VFS_IN_DUP
+        VFS_IN_DUP,
+        VFS_IN_WAIT_HANDLE,
 } vfs_in_request_t;