Changes in uspace/srv/fs/ext2fs/ext2fs.c [9934f7d:5bd1ffb] in mainline

File:

• uspace/srv/fs/ext2fs/ext2fs.c (modified) (5 diffs)

uspace/srv/fs/ext2fs/ext2fs.c

@@ -40 +40 @@
 #include "ext2fs.h"
 #include <ipc/services.h>
-#include <ns.h>
+#include <ipc/ns.h>
 #include <async.h>
 #include <errno.h>
@@ -75 +75 @@
  * request has been completed.
  */
-static void ext2fs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ext2fs_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         if (iid) {
@@ -87 +87 @@
         
         dprintf(NAME ": connection opened\n");
-        while (true) {
+        while (1) {
+                ipc_callid_t callid;
                 ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call))
+        
+                callid = async_get_call(&call);
+                switch  (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
                         return;
-                
-                switch (IPC_GET_IMETHOD(call)) {
                 case VFS_OUT_MOUNTED:
                         ext2fs_mounted(callid, &call);
@@ -143 +143 @@
 int main(int argc, char **argv)
 {
+        int vfs_phone;
+        int rc;
+
         printf(NAME ": HelenOS EXT2 file system server\n");
-        
-        async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_VFS, 0, 0);
-        if (!vfs_sess) {
+
+        vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
+        if (vfs_phone < EOK) {
                 printf(NAME ": failed to connect to VFS\n");
                 return -1;
         }
 
-        int rc = ext2fs_global_init();
+        rc = ext2fs_global_init();
         if (rc != EOK) {
                 printf(NAME ": Failed global initialization\n");
@@ -158 +160 @@
         }       
                 
-        rc = fs_register(vfs_sess, &ext2fs_reg, &ext2fs_vfs_info, ext2fs_connection);
+        rc = fs_register(vfs_phone, &ext2fs_reg, &ext2fs_vfs_info, ext2fs_connection);
         if (rc != EOK) {
                 fprintf(stdout, NAME ": Failed to register fs (%d)\n", rc);