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

File:

• uspace/srv/vfs/vfs_register.c (modified) (5 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>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <str.h>
+#include <string.h>
 #include <ctype.h>
 #include <bool.h>
+#include <fibril_synch.h>
 #include <adt/list.h>
 #include <as.h>
@@ -253 +252 @@
 int vfs_grab_phone(fs_handle_t handle)
 {
-        link_t *cur;
-        fs_info_t *fs;
         int phone;
 
@@ -265 +262 @@
          */
         fibril_mutex_lock(&fs_head_lock);
+        link_t *cur;
+        fs_info_t *fs;
         for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
                 fs = list_get_instance(cur, fs_info_t, fs_link);
@@ -270 +269 @@
                         fibril_mutex_unlock(&fs_head_lock);
                         fibril_mutex_lock(&fs->phone_lock);
-                        phone = async_relation_create(fs->phone);
+                        phone = ipc_connect_me_to(fs->phone, 0, 0, 0);
                         fibril_mutex_unlock(&fs->phone_lock);
 
@@ -285 +284 @@
  * @param phone         Phone to FS task.
  */
-void vfs_release_phone(fs_handle_t handle, int phone)
-{
-        link_t *cur;
-        fs_info_t *fs;
-
-        fibril_mutex_lock(&fs_head_lock);
-        for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
-                fs = list_get_instance(cur, fs_info_t, fs_link);
-                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);
-                        return;
-                }
-        }
-        /* should not really get here */
-        abort();
-        fibril_mutex_unlock(&fs_head_lock);
+void vfs_release_phone(int phone)
+{
+        /* TODO: implement connection caching */
+        ipc_hangup(phone);
 }