Changeset 41811af in mainline for uspace/srv/fs/tmpfs/tmpfs.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/fs/tmpfs/tmpfs.c (modified) (6 diffs)

uspace/srv/fs/tmpfs/tmpfs.c

@@ -30 +30 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 /**
@@ -43 +43 @@
 #include "tmpfs.h"
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <errno.h>
@@ -94 +94 @@
         
         dprintf(NAME ": connection opened\n");
-        while (1) {
-                ipc_callid_t callid;
+        
+        while (true) {
                 ipc_call_t call;
-        
-                callid = async_get_call(&call);
-                switch  (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
                         return;
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case VFS_OUT_MOUNTED:
                         tmpfs_mounted(callid, &call);
@@ -151 +152 @@
 {
         printf(NAME ": HelenOS TMPFS file system server\n");
-
+        
         if (!tmpfs_init()) {
                 printf(NAME ": failed to initialize TMPFS\n");
                 return -1;
         }
-
-        int vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
-        if (vfs_phone < EOK) {
+        
+        async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+            SERVICE_VFS, 0, 0);
+        if (!vfs_sess) {
                 printf(NAME ": Unable to connect to VFS\n");
                 return -1;
         }
-
-        int rc = fs_register(vfs_phone, &tmpfs_reg, &tmpfs_vfs_info,
+        
+        int rc = fs_register(vfs_sess, &tmpfs_reg, &tmpfs_vfs_info,
             tmpfs_connection);
         if (rc != EOK) {
@@ -169 +171 @@
                 return rc;
         }
-
+        
         printf(NAME ": Accepting connections\n");
         task_retval(0);
         async_manager();
-        /* not reached */
+        
+        /* Not reached */
         return 0;
 }
@@ -179 +182 @@
 /**
  * @}
- */ 
+ */