Changes in uspace/srv/vfs/vfs_register.c [ffa2c8ef:df908b3] in mainline

File:

• uspace/srv/vfs/vfs_register.c (modified) (13 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>
@@ -109 +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);
@@ -121 +121 @@
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
                     rc);
-                async_answer_0(rid, rc);
+                ipc_answer_0(rid, rc);
                 return;
         }
@@ -131 +131 @@
         if (!fs_info) {
                 dprintf("Could not allocate memory for FS info.\n");
-                async_answer_0(rid, ENOMEM);
+                ipc_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);
@@ -143 +144 @@
         if (!vfs_info_sane(&fs_info->vfs_info)) {
                 free(fs_info);
-                async_answer_0(rid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -159 +160 @@
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                async_answer_0(rid, EEXISTS);
+                ipc_answer_0(rid, EEXISTS);
                 return;
         }
@@ -176 +177 @@
         ipc_call_t call;
         ipc_callid_t callid = async_get_call(&call);
-        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
-                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
+        if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
+                dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
                 free(fs_info);
-                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);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+        fs_info->phone = IPC_GET_ARG5(call);
+        ipc_answer_0(callid, EOK);
         
         dprintf("Callback connection to FS created.\n");
@@ -198 +197 @@
         size_t size;
         if (!async_share_in_receive(&callid, &size)) {
-                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
+                dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                async_session_destroy(&fs_info->session);
-                async_hangup(phone);
-                free(fs_info);
-                async_answer_0(callid, EINVAL);
-                async_answer_0(rid, EINVAL);
+                ipc_hangup(fs_info->phone);
+                free(fs_info);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -216 +214 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                async_session_destroy(&fs_info->session);
-                async_hangup(phone);
-                free(fs_info);
-                async_answer_0(callid, EINVAL);
-                async_answer_0(rid, EINVAL);
+                ipc_hangup(fs_info->phone);
+                free(fs_info);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -238 +235 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        async_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
+        ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
         
         fibril_condvar_broadcast(&fs_head_cv);
@@ -272 +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);
@@ -296 +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;
                 }
@@ -332 +333 @@
 }
 
-/** Find the VFS info structure.
- *
- * @param handle        FS handle for which the VFS info structure is sought.
- * @return              VFS info structure on success or NULL otherwise.
- */
-vfs_info_t *fs_handle_to_info(fs_handle_t handle)
-{
-        vfs_info_t *info = NULL;
-        link_t *cur;
-
-        fibril_mutex_lock(&fs_head_lock);
-        for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
-                fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-                if (fs->fs_handle == handle) { 
-                        info = &fs->vfs_info;
-                        break;
-                }
-        }
-        fibril_mutex_unlock(&fs_head_lock);
-
-        return info;
-}
-
 /**
  * @}