Changeset ad7a6c9 in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/vfs/vfs_register.c (modified) (12 diffs)

uspace/srv/vfs/vfs_register.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <async.h>
-#include <async_rel.h>
 #include <fibril.h>
 #include <fibril_synch.h>
@@ -111 +109 @@
 void vfs_register(ipc_callid_t rid, ipc_call_t *request)
 {
+        int phone;
+        
         dprintf("Processing VFS_REGISTER request received from %p.\n",
             request->in_phone_hash);
@@ -121 +121 @@
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
                     rc);
-                ipc_answer_0(rid, rc);
+                async_answer_0(rid, rc);
                 return;
         }
@@ -131 +131 @@
         if (!fs_info) {
                 dprintf("Could not allocate memory for FS info.\n");
-                ipc_answer_0(rid, ENOMEM);
+                async_answer_0(rid, ENOMEM);
                 return;
         }
         
         link_initialize(&fs_info->fs_link);
-        fibril_mutex_initialize(&fs_info->phone_lock);
         fs_info->vfs_info = *vfs_info;
         free(vfs_info);
@@ -144 +143 @@
         if (!vfs_info_sane(&fs_info->vfs_info)) {
                 free(fs_info);
-                ipc_answer_0(rid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -160 +159 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                ipc_answer_0(rid, EEXISTS);
+                async_answer_0(rid, EEXISTS);
                 return;
         }
@@ -182 +181 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-        fs_info->phone = IPC_GET_ARG5(call);
-        ipc_answer_0(callid, EOK);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
+                return;
+        }
+        
+        phone = IPC_GET_ARG5(call);
+        async_session_create(&fs_info->session, phone, 0);
+        async_answer_0(callid, EOK);
         
         dprintf("Callback connection to FS created.\n");
@@ -200 +201 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                ipc_hangup(fs_info->phone);
-                free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_session_destroy(&fs_info->session);
+                async_hangup(phone);
+                free(fs_info);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -214 +216 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                ipc_hangup(fs_info->phone);
-                free(fs_info);
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
+                async_session_destroy(&fs_info->session);
+                async_hangup(phone);
+                free(fs_info);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(rid, EINVAL);
                 return;
         }
@@ -235 +238 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        ipc_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
+        async_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
         
         fibril_condvar_broadcast(&fs_head_cv);
@@ -269 +272 @@
                 if (fs->fs_handle == handle) {
                         fibril_mutex_unlock(&fs_head_lock);
-                        fibril_mutex_lock(&fs->phone_lock);
-                        phone = async_relation_create(fs->phone);
-                        fibril_mutex_unlock(&fs->phone_lock);
+                        phone = async_exchange_begin(&fs->session);
 
                         assert(phone > 0);
@@ -295 +296 @@
                 if (fs->fs_handle == handle) {
                         fibril_mutex_unlock(&fs_head_lock);
-                        fibril_mutex_lock(&fs->phone_lock);
-                        async_relation_destroy(fs->phone, phone);
-                        fibril_mutex_unlock(&fs->phone_lock);
+                        async_exchange_end(&fs->session, phone);
                         return;
                 }