Changes in uspace/srv/vfs/vfs.c [0fe52ef:79ae36dd] in mainline

File:

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

uspace/srv/vfs/vfs.c

@@ -36 +36 @@
  */
 
-#include <vfs/vfs.h>
 #include <ipc/services.h>
-#include <abi/ipc/event.h>
-#include <event.h>
 #include <ns.h>
 #include <async.h>
@@ -48 +45 @@
 #include <as.h>
 #include <atomic.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)
+static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         bool cont = true;
@@ -87 +79 @@
                 case VFS_IN_OPEN:
                         vfs_open(callid, &call);
+                        break;
+                case VFS_IN_OPEN_NODE:
+                        vfs_open_node(callid, &call);
                         break;
                 case VFS_IN_CLOSE:
@@ -123 +118 @@
                 case VFS_IN_DUP:
                         vfs_dup(callid, &call);
-                        break;
-                case VFS_IN_WAIT_HANDLE:
-                        vfs_wait_handle(callid, &call);
-                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);
@@ -137 +128 @@
          * connection fibril terminates.
          */
-}
-
-static void notification_received(ipc_callid_t callid, ipc_call_t *call)
-{
-        switch (IPC_GET_IMETHOD(*call)) {
-        case VFS_TASK_STATE_CHANGE:
-                if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
-                        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:
-                break;
-        }
 }
 
@@ -194 +170 @@
 
         /*
-         * Set notification handler and subscribe to notifications.
-         */
-        async_set_interrupt_received(notification_received);
-        event_task_subscribe(EVENT_TASK_STATE_CHANGE, VFS_TASK_STATE_CHANGE);
-
-        /*
          * Register at the naming service.
          */