Changeset 9247c02c in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2011-08-19T14:06:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7a2f7ecd

Parents:

2f2f1186 (diff), e2ab36f1 (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 from lp:~jakub/helenos/camp2011.

File:

• uspace/srv/vfs/vfs.c (modified) (3 diffs)

uspace/srv/vfs/vfs.c

@@ -36 +36 @@
  */
 
+#include <vfs/vfs.h>
 #include <ipc/services.h>
 #include <abi/ipc/event.h>
@@ -47 +48 @@
 #include <as.h>
 #include <atomic.h>
-#include <vfs/vfs.h>
+#include <macros.h>
 #include "vfs.h"
 
@@ -143 +144 @@
         case VFS_TASK_STATE_CHANGE:
                 if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
-                        vfs_pass_handle(IPC_GET_ARG4(*call),
-                            IPC_GET_ARG5(*call), (int) IPC_GET_ARG2(*call));
+                        vfs_pass_handle(
+                            (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call),
+                            IPC_GET_ARG5(*call)), call->in_task_id,
+                            (int) IPC_GET_ARG2(*call));
                 break;
         default: