Changeset 41811af in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

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>
@@ -51 +51 @@
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-        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