Changeset 0b749a3 in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2010-11-22T15:39:53Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:

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

uspace/srv/vfs/vfs_lookup.c

@@ -163 +163 @@
         aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (ipcarg_t) first,
             (ipcarg_t) (first + len - 1) % PLB_SIZE,
-            (ipcarg_t) root->dev_handle, (ipcarg_t) lflag, (ipcarg_t) index,
+            (ipcarg_t) root->devmap_handle, (ipcarg_t) lflag, (ipcarg_t) index,
             &answer);
         
         ipcarg_t rc;
         async_wait_for(req, &rc);
-        vfs_release_phone(phone);
+        vfs_release_phone(root->fs_handle, phone);
         
         fibril_mutex_lock(&plb_mutex);
@@ -183 +183 @@
         
         result->triplet.fs_handle = (fs_handle_t) rc;
-        result->triplet.dev_handle = (dev_handle_t) IPC_GET_ARG1(answer);
+        result->triplet.devmap_handle = (devmap_handle_t) IPC_GET_ARG1(answer);
         result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
         result->size =
@@ -210 +210 @@
         ipc_call_t answer;
         aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
-            (ipcarg_t) result->triplet.dev_handle,
+            (ipcarg_t) result->triplet.devmap_handle,
             (ipcarg_t) result->triplet.index, &answer);
         
         ipcarg_t rc;
         async_wait_for(req, &rc);
-        vfs_release_phone(phone);
+        vfs_release_phone(result->triplet.fs_handle, phone);
         
         if (rc == EOK) {