Changeset 1affcdf3 in mainline for uspace/srv/fs/minixfs/mfs.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/fs/minixfs/mfs.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs.c

@@ -41 +41 @@
 
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <errno.h>
@@ -47 +47 @@
 #include <task.h>
 #include <stdio.h>
+#include <libfs.h>
 #include "mfs.h"
 
@@ -96 +97 @@
                 /*mfsdebug(NAME "method = %d\n", method);*/
                 switch  (method) {
-                case IPC_M_PHONE_HUNGUP:
-                        return;
                 case VFS_OUT_MOUNTED:
                         mfs_mounted(callid, &call);
@@ -135 +134 @@
 int main(int argc, char **argv)
 {
-        int vfs_phone;
         int rc;
 
         printf(NAME ": HelenOS Minix file system server\n");
 
-        vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
+        async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+                                SERVICE_VFS, 0, 0);
 
-        if (vfs_phone < EOK) {
+        if (!vfs_sess) {
                 printf(NAME ": failed to connect to VFS\n");
                 return -1;
         }
 
-        rc = fs_register(vfs_phone, &mfs_reg, &mfs_vfs_info, mfs_connection);
+        rc = fs_register(vfs_sess, &mfs_reg, &mfs_vfs_info, mfs_connection);
         if (rc != EOK)
                 goto err;