Changes in uspace/srv/vfs/vfs.c [27b76ca:0fe52ef] in mainline

File:

• uspace/srv/vfs/vfs.c (modified) (4 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"
 
 #define NAME  "vfs"
+
+enum {
+        VFS_TASK_STATE_CHANGE
+};
 
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
@@ -134 +139 @@
 }
 
-enum {
-        VFS_TASK_STATE_CHANGE
-};
-
 static void notification_received(ipc_callid_t callid, ipc_call_t *call)
 {
@@ -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: