Changeset eb87adb in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2011-09-24T20:25:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d03da17

Parents:

4093b14 (diff), f1a9e87 (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/srv/vfs/vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -146 +146 @@
 
                         rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
+                            IPC_GET_ARG3(answer));
                         rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                         
@@ -276 +277 @@
         
         /*
-         * For now, don't make use of ARG3, but it can be used to
-         * carry mount options in the future.
-         */
-        
+         * Instance number is passed as ARG3.
+         */
+        unsigned int instance = IPC_GET_ARG3(*request);
+
         /* We want the client to send us the mount point. */
         char *mp;
@@ -335 +336 @@
         fs_handle_t fs_handle;
 recheck:
-        fs_handle = fs_name_to_handle(fs_name, false);
+        fs_handle = fs_name_to_handle(instance, fs_name, false);
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {