Changeset 17aca1c in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2011-02-04T20:56:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (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/lib/c/generic/vfs/vfs.c (modified) (3 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Jakub Jermar 
+ * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
  *
@@ -43 +43 @@
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <async.h>
 #include <fibril_synch.h>
@@ -118 +118 @@
 static void vfs_connect(void)
 {
-        while (vfs_phone < 0) {
-                vfs_phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_VFS,
-                    0, 0);
-        }
+        while (vfs_phone < 0)
+                vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
         
         async_session_create(&vfs_session, vfs_phone, 0);