Changeset 20235a3 in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2010-09-02T20:55:28Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c39b96

Parents:

0c61955 (diff), 3249673 (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) (6 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>
@@ -46 +48 @@
 #include <ctype.h>
 #include <bool.h>
-#include <fibril_synch.h>
 #include <adt/list.h>
 #include <as.h>
@@ -252 +253 @@
 int vfs_grab_phone(fs_handle_t handle)
 {
+        link_t *cur;
+        fs_info_t *fs;
         int phone;
 
@@ -262 +265 @@
          */
         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);
@@ -269 +270 @@
                         fibril_mutex_unlock(&fs_head_lock);
                         fibril_mutex_lock(&fs->phone_lock);
-                        phone = ipc_connect_me_to(fs->phone, 0, 0, 0);
+                        phone = async_relation_create(fs->phone);
                         fibril_mutex_unlock(&fs->phone_lock);
 
@@ -284 +285 @@
  * @param phone         Phone to FS task.
  */
-void vfs_release_phone(int phone)
-{
-        /* TODO: implement connection caching */
-        ipc_hangup(phone);
+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);
 }