Changeset 4f5dc18 in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

File:

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

uspace/srv/vfs/vfs_register.c

@@ -122 +122 @@
          * VFS info structure from the client FS.
          */
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 /*
                  * The client doesn't obey the same protocol as we do.
@@ -163 +163 @@
         fibril_mutex_initialize(&fs_info->phone_lock);
                 
-        rc = ipc_data_write_finalize(callid, &fs_info->vfs_info, size);
+        rc = async_data_write_finalize(callid, &fs_info->vfs_info, size);
         if (rc != EOK) {
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
@@ -229 +229 @@
          */
 
-        if (!ipc_share_in_receive(&callid, &size)) {
+        if (!async_share_in_receive(&callid, &size)) {
                 dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
                 list_remove(&fs_info->fs_link);
@@ -257 +257 @@
          * Commit to read-only sharing the PLB with the client.
          */
-        (void) ipc_share_in_finalize(callid, plb,
+        (void) async_share_in_finalize(callid, plb,
             AS_AREA_READ | AS_AREA_CACHEABLE);