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

Timestamp:

2011-08-16T18:53:00Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

49160c4

Parents:

e0e922d (diff), 45058baa (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) (3 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -162 +162 @@
         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,
+            (sysarg_t) root->service_id, (sysarg_t) lflag, (sysarg_t) index,
             &answer);
         
@@ -185 +185 @@
         
         result->triplet.fs_handle = (fs_handle_t) rc;
-        result->triplet.devmap_handle = (devmap_handle_t) IPC_GET_ARG1(answer);
+        result->triplet.service_id = (service_id_t) IPC_GET_ARG1(answer);
         result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
         result->size =
@@ -212 +212 @@
         ipc_call_t answer;
         aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE,
-            (sysarg_t) result->triplet.devmap_handle,
+            (sysarg_t) result->triplet.service_id,
             (sysarg_t) result->triplet.index, &answer);