Changeset 6fe0bf8d in mainline for uspace/lib/c

Timestamp:

2011-09-23T16:09:05Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1924bd43

Parents:

ac2c3f8f (diff), 286286c (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 with mainline

Location:

uspace/lib/c

Files:

• generic/vfs/vfs.c (modified) (2 diffs)
• include/ipc/vfs.h (modified) (1 diff)
• include/vfs/vfs.h (modified) (1 diff)

uspace/lib/c/generic/vfs/vfs.c

@@ -143 +143 @@
 
 int mount(const char *fs_name, const char *mp, const char *fqsn,
-    const char *opts, unsigned int flags)
+    const char *opts, unsigned int flags, unsigned int instance)
 {
         int null_id = -1;
@@ -181 +181 @@
 
         sysarg_t rc_orig;
-        aid_t req = async_send_2(exch, VFS_IN_MOUNT, service_id, flags, NULL);
+        aid_t req = async_send_3(exch, VFS_IN_MOUNT, service_id, flags,
+            instance, NULL);
         sysarg_t rc = async_data_write_start(exch, (void *) mpa, mpa_size);
         if (rc != EOK) {

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;

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

@@ -49 +49 @@
 
 extern int mount(const char *, const char *, const char *, const char *,
-    unsigned int);
+    unsigned int, unsigned int);
 extern int unmount(const char *);