Changeset cd50486 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2011-02-06T22:03:55Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (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 development/ changes

File:

• uspace/srv/vfs/vfs.c (modified) (5 diffs)

uspace/srv/vfs/vfs.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <async.h>
 #include <errno.h>
@@ -47 +47 @@
 #include "vfs.h"
 
-#define NAME "vfs"
+#define NAME  "vfs"
 
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall)
@@ -57 +57 @@
          * This call needs to be answered.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (keep_on_going) {
@@ -119 +119 @@
                         vfs_dup(callid, &call);
                 default:
-                        ipc_answer_0(callid, ENOTSUP);
+                        async_answer_0(callid, ENOTSUP);
                         break;
                 }
@@ -172 +172 @@
          * Register at the naming service.
          */
-        ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, 0, NULL, NULL);
+        if (service_register(SERVICE_VFS) != EOK) {
+                printf("%s: Cannot register VFS service\n", NAME);
+                return EINVAL;
+        }
         
         /*