Changeset 6a44ee4 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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.c (modified) (4 diffs)

uspace/srv/vfs/vfs.c

@@ -37 +37 @@
 
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <errno.h>
@@ -49 +49 @@
 #define NAME  "vfs"
 
-static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        bool keep_on_going = true;
-
+        bool cont = true;
+        
         /*
          * The connection was opened via the IPC_CONNECT_ME_TO call.
@@ -59 +59 @@
         async_answer_0(iid, EOK);
         
-        while (keep_on_going) {
+        while (cont) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+                
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        keep_on_going = false;
-                        break;
                 case VFS_IN_REGISTER:
                         vfs_register(callid, &call);
-                        keep_on_going = false;
+                        cont = false;
                         break;
                 case VFS_IN_MOUNT:
@@ -123 +123 @@
                 }
         }
-
+        
         /*
          * Open files for this client will be cleaned up when its last