Changeset 357b5f5 in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2011-01-23T20:09:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (10 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>
@@ -111 +110 @@
 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);
@@ -136 +137 @@
         
         link_initialize(&fs_info->fs_link);
-        fibril_mutex_initialize(&fs_info->phone_lock);
         fs_info->vfs_info = *vfs_info;
         free(vfs_info);
@@ -177 +177 @@
         ipc_call_t call;
         ipc_callid_t callid = async_get_call(&call);
-        if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
-                dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
+        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
+                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
@@ -186 +186 @@
                 return;
         }
-        fs_info->phone = IPC_GET_ARG5(call);
+        
+        phone = IPC_GET_ARG5(call);
+        async_session_create(&fs_info->session, phone, 0);
         ipc_answer_0(callid, EOK);
         
@@ -197 +199 @@
         size_t size;
         if (!async_share_in_receive(&callid, &size)) {
-                dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
+                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                ipc_hangup(fs_info->phone);
+                async_session_destroy(&fs_info->session);
+                ipc_hangup(phone);
                 free(fs_info);
                 ipc_answer_0(callid, EINVAL);
@@ -214 +217 @@
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
-                ipc_hangup(fs_info->phone);
+                async_session_destroy(&fs_info->session);
+                ipc_hangup(phone);
                 free(fs_info);
                 ipc_answer_0(callid, EINVAL);
@@ -235 +239 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
+        ipc_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
         
         fibril_condvar_broadcast(&fs_head_cv);
@@ -269 +273 @@
                 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 +297 @@
                 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;
                 }