Changeset 8fb1bf82 in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2010-11-25T13:42:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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/lib/c/generic/vfs/vfs.c (modified) (4 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -136 +136 @@
         }
         
-        dev_handle_t dev_handle;
-        int res = devmap_device_get_handle(fqdn, &dev_handle, flags);
+        devmap_handle_t devmap_handle;
+        int res = devmap_device_get_handle(fqdn, &devmap_handle, flags);
         if (res != EOK) {
                 if (null_id != -1)
@@ -159 +159 @@
         
         ipcarg_t rc_orig;
-        aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
+        aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, devmap_handle, flags, NULL);
         ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
         if (rc != EOK) {
@@ -328 +328 @@
         ipc_call_t answer;
         aid_t req = async_send_4(vfs_phone, VFS_IN_OPEN_NODE, node->fs_handle,
-            node->dev_handle, node->index, oflag, &answer);
+            node->devmap_handle, node->index, oflag, &answer);
         
         ipcarg_t rc;
@@ -797 +797 @@
         if (rc == EOK) {
                 node->fs_handle = stat.fs_handle;
-                node->dev_handle = stat.dev_handle;
+                node->devmap_handle = stat.devmap_handle;
                 node->index = stat.index;
         }