Changeset c028b22 in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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_lookup.c (modified) (7 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -50 +50 @@
 
 FIBRIL_MUTEX_INITIALIZE(plb_mutex);
-LIST_INITIALIZE(plb_head);      /**< PLB entry ring buffer. */
+LIST_INITIALIZE(plb_entries);   /**< PLB entry ring buffer. */
 uint8_t *plb = NULL;
 
@@ -102 +102 @@
         size_t last;    /* the last free index */
 
-        if (list_empty(&plb_head)) {
+        if (list_empty(&plb_entries)) {
                 first = 0;
                 last = PLB_SIZE - 1;
         } else {
-                plb_entry_t *oldest = list_get_instance(plb_head.next,
-                    plb_entry_t, plb_link);
-                plb_entry_t *newest = list_get_instance(plb_head.prev,
-                    plb_entry_t, plb_link);
+                plb_entry_t *oldest = list_get_instance(
+                    list_first(&plb_entries), plb_entry_t, plb_link);
+                plb_entry_t *newest = list_get_instance(
+                    list_last(&plb_entries), plb_entry_t, plb_link);
 
                 first = (newest->index + newest->len) % PLB_SIZE;
@@ -145 +145 @@
          * buffer.
          */
-        list_append(&entry.plb_link, &plb_head);
+        list_append(&entry.plb_link, &plb_entries);
         
         fibril_mutex_unlock(&plb_mutex);
@@ -159 +159 @@
 
         ipc_call_t answer;
-        int phone = vfs_grab_phone(root->fs_handle);
-        aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (sysarg_t) first,
+        async_exch_t *exch = vfs_exchange_grab(root->fs_handle);
+        aid_t req = async_send_5(exch, VFS_OUT_LOOKUP, (sysarg_t) first,
             (sysarg_t) (first + len - 1) % PLB_SIZE,
             (sysarg_t) root->devmap_handle, (sysarg_t) lflag, (sysarg_t) index,
@@ -167 +167 @@
         sysarg_t rc;
         async_wait_for(req, &rc);
-        vfs_release_phone(root->fs_handle, phone);
+        vfs_exchange_release(exch);
         
         fibril_mutex_lock(&plb_mutex);
@@ -208 +208 @@
 int vfs_open_node_internal(vfs_lookup_res_t *result)
 {
-        int phone = vfs_grab_phone(result->triplet.fs_handle);
+        async_exch_t *exch = vfs_exchange_grab(result->triplet.fs_handle);
         
         ipc_call_t answer;
-        aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
+        aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE,
             (sysarg_t) result->triplet.devmap_handle,
             (sysarg_t) result->triplet.index, &answer);
@@ -217 +217 @@
         sysarg_t rc;
         async_wait_for(req, &rc);
-        vfs_release_phone(result->triplet.fs_handle, phone);
+        vfs_exchange_release(exch);
         
         if (rc == EOK) {