Changes in uspace/srv/vfs/vfs_register.c [4791e3c:228e490] in mainline

File:

• uspace/srv/vfs/vfs_register.c (modified) (8 diffs)

uspace/srv/vfs/vfs_register.c

@@ -39 +39 @@
 #include <ipc/services.h>
 #include <async.h>
+#include <async_rel.h>
 #include <fibril.h>
 #include <fibril_synch.h>
@@ -110 +111 @@
 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);
@@ -137 +136 @@
         
         link_initialize(&fs_info->fs_link);
+        fibril_mutex_initialize(&fs_info->phone_lock);
         fs_info->vfs_info = *vfs_info;
         free(vfs_info);
@@ -186 +186 @@
                 return;
         }
-        
-        phone = IPC_GET_ARG5(call);
-        async_session_create(&fs_info->session, phone);
+        fs_info->phone = IPC_GET_ARG5(call);
         ipc_answer_0(callid, EOK);
         
@@ -202 +200 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                async_session_destroy(&fs_info->session);
-                ipc_hangup(phone);
+                ipc_hangup(fs_info->phone);
                 free(fs_info);
                 ipc_answer_0(callid, EINVAL);
@@ -217 +214 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                async_session_destroy(&fs_info->session);
-                ipc_hangup(phone);
+                ipc_hangup(fs_info->phone);
                 free(fs_info);
                 ipc_answer_0(callid, EINVAL);
@@ -273 +269 @@
                 if (fs->fs_handle == handle) {
                         fibril_mutex_unlock(&fs_head_lock);
-                        phone = async_exchange_begin(&fs->session);
+                        fibril_mutex_lock(&fs->phone_lock);
+                        phone = async_relation_create(fs->phone);
+                        fibril_mutex_unlock(&fs->phone_lock);
 
                         assert(phone > 0);
@@ -297 +295 @@
                 if (fs->fs_handle == handle) {
                         fibril_mutex_unlock(&fs_head_lock);
-                        async_exchange_end(&fs->session, phone);
+                        fibril_mutex_lock(&fs->phone_lock);
+                        async_relation_destroy(fs->phone, phone);
+                        fibril_mutex_unlock(&fs->phone_lock);
                         return;
                 }