Changeset 41811af in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/srv/vfs/vfs_lookup.c (modified) (4 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -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) {