Changes in uspace/srv/vfs/vfs.c [41e9ef7:ffa2c8ef] in mainline

File:

• uspace/srv/vfs/vfs.c (modified) (7 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 <ipc/ns.h>
 #include <async.h>
 #include <errno.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)
+{
+        bool keep_on_going = true;
 
-static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-        bool cont = true;
-        
         /*
          * The connection was opened via the IPC_CONNECT_ME_TO call.
@@ -67 +59 @@
         async_answer_0(iid, EOK);
         
-        while (cont) {
+        while (keep_on_going) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 
-                if (!IPC_GET_IMETHOD(call))
+                switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
+                        keep_on_going = false;
                         break;
-                
-                switch (IPC_GET_IMETHOD(call)) {
                 case VFS_IN_REGISTER:
                         vfs_register(callid, &call);
-                        cont = false;
+                        keep_on_going = false;
                         break;
                 case VFS_IN_MOUNT:
@@ -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;
-                case VFS_IN_MTAB_GET:
-                        vfs_get_mtab(callid, &call);
-                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);
@@ -135 +123 @@
                 }
         }
-        
+
         /*
          * Open files for this client will be cleaned up when its last
          * 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;
-        }
 }
 
@@ -197 +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.
          */