Index: uspace/srv/bd/ata_bd/ata_bd.c =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/bd/ata_bd/ata_bd.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -252,5 +252,5 @@ ipc_answer_0(iid, EOK); - if (!ipc_share_out_receive(&callid, &comm_size, &flags)) { + if (!async_share_out_receive(&callid, &comm_size, &flags)) { ipc_answer_0(callid, EHANGUP); return; @@ -263,5 +263,5 @@ } - (void) ipc_share_out_finalize(callid, fs_va); + (void) async_share_out_finalize(callid, fs_va); while (1) { Index: uspace/srv/bd/file_bd/file_bd.c =================================================================== --- uspace/srv/bd/file_bd/file_bd.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/bd/file_bd/file_bd.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -130,5 +130,5 @@ ipc_answer_0(iid, EOK); - if (!ipc_share_out_receive(&callid, &comm_size, &flags)) { + if (!async_share_out_receive(&callid, &comm_size, &flags)) { ipc_answer_0(callid, EHANGUP); return; @@ -141,5 +141,5 @@ } - (void) ipc_share_out_finalize(callid, fs_va); + (void) async_share_out_finalize(callid, fs_va); while (1) { Index: uspace/srv/bd/gxe_bd/gxe_bd.c =================================================================== --- uspace/srv/bd/gxe_bd/gxe_bd.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/bd/gxe_bd/gxe_bd.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -185,5 +185,5 @@ ipc_answer_0(iid, EOK); - if (!ipc_share_out_receive(&callid, &comm_size, &flags)) { + if (!async_share_out_receive(&callid, &comm_size, &flags)) { ipc_answer_0(callid, EHANGUP); return; @@ -201,5 +201,5 @@ } - (void) ipc_share_out_finalize(callid, fs_va); + (void) async_share_out_finalize(callid, fs_va); while (1) { Index: uspace/srv/bd/rd/rd.c =================================================================== --- uspace/srv/bd/rd/rd.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/bd/rd/rd.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -102,8 +102,8 @@ */ int flags; - if (ipc_share_out_receive(&callid, &comm_size, &flags)) { + if (async_share_out_receive(&callid, &comm_size, &flags)) { fs_va = as_get_mappable_page(comm_size); if (fs_va) { - (void) ipc_share_out_finalize(callid, fs_va); + (void) async_share_out_finalize(callid, fs_va); } else { ipc_answer_0(callid, EHANGUP); Index: uspace/srv/console/console.c =================================================================== --- uspace/srv/console/console.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/console/console.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -429,5 +429,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -442,5 +442,5 @@ } - (void) ipc_data_write_finalize(callid, buf, size); + (void) async_data_write_finalize(callid, buf, size); async_serialize_start(); @@ -464,5 +464,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_read_receive(&callid, &size)) { + if (!async_data_read_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -489,5 +489,5 @@ if (pos == size) { - (void) ipc_data_read_finalize(callid, buf, size); + (void) async_data_read_finalize(callid, buf, size); ipc_answer_1(rid, EOK, size); free(buf); @@ -713,5 +713,5 @@ if (interbuffer) { - if (ipc_share_out_start(fb_info.phone, interbuffer, + if (async_share_out_start(fb_info.phone, interbuffer, AS_AREA_READ) != EOK) { as_area_destroy(interbuffer); Index: uspace/srv/console/gcons.c =================================================================== --- uspace/srv/console/gcons.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/console/gcons.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -339,5 +339,5 @@ goto exit; - rc = ipc_share_out_start(fbphone, shm, PROTO_READ); + rc = async_share_out_start(fbphone, shm, PROTO_READ); if (rc) goto drop; @@ -409,5 +409,5 @@ goto exit; - rc = ipc_share_out_start(fbphone, shm, PROTO_READ); + rc = async_share_out_start(fbphone, shm, PROTO_READ); if (rc) goto drop; Index: uspace/srv/devmap/devmap.c =================================================================== --- uspace/srv/devmap/devmap.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/devmap/devmap.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -213,5 +213,5 @@ ipc_callid_t callid; size_t name_size; - if (!ipc_data_write_receive(&callid, &name_size)) { + if (!async_data_write_receive(&callid, &name_size)) { free(driver); ipc_answer_0(callid, EREFUSED); @@ -241,5 +241,5 @@ * Send confirmation to sender and get data into buffer. */ - if (ipc_data_write_finalize(callid, driver->name, name_size) != EOK) { + if (async_data_write_finalize(callid, driver->name, name_size) != EOK) { free(driver->name); free(driver); @@ -358,5 +358,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { free(device); ipc_answer_0(iid, EREFUSED); @@ -381,5 +381,5 @@ } - ipc_data_write_finalize(callid, device->name, size); + async_data_write_finalize(callid, device->name, size); device->name[size] = 0; @@ -466,5 +466,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EREFUSED); ipc_answer_0(iid, EREFUSED); @@ -491,5 +491,5 @@ * Send confirmation to sender and get data into buffer. */ - ipcarg_t retval = ipc_data_write_finalize(callid, name, size); + ipcarg_t retval = async_data_write_finalize(callid, name, size); if (retval != EOK) { ipc_answer_0(iid, EREFUSED); @@ -553,5 +553,5 @@ * size_t name_size = str_size(device->name); * - * int rc = ipc_data_write_send(phone, device->name, name_size); + * int rc = async_data_write_send(phone, device->name, name_size); * if (rc != EOK) { * async_wait_for(req, NULL); @@ -576,5 +576,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_read_receive(&callid, &size)) { + if (!async_data_read_receive(&callid, &size)) { ipc_answer_0(callid, EREFUSED); ipc_answer_0(iid, EREFUSED); @@ -608,5 +608,5 @@ } - ipcarg_t retval = ipc_data_read_finalize(callid, desc, pos * sizeof(dev_desc_t)); + ipcarg_t retval = async_data_read_finalize(callid, desc, pos * sizeof(dev_desc_t)); if (retval != EOK) { ipc_answer_0(iid, EREFUSED); Index: uspace/srv/fs/devfs/devfs_ops.c =================================================================== --- uspace/srv/fs/devfs/devfs_ops.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/fs/devfs/devfs_ops.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -108,5 +108,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -121,5 +121,5 @@ } - ipcarg_t retval = ipc_data_write_finalize(callid, opts, size); + ipcarg_t retval = async_data_write_finalize(callid, opts, size); if (retval != EOK) { ipc_answer_0(rid, retval); @@ -286,5 +286,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_read_receive(&callid, &size) || + if (!async_data_read_receive(&callid, &size) || size != sizeof(struct stat)) { ipc_answer_0(callid, EINVAL); @@ -315,5 +315,5 @@ } - ipc_data_read_finalize(callid, &stat, sizeof(struct stat)); + async_data_read_finalize(callid, &stat, sizeof(struct stat)); ipc_answer_0(rid, EOK); } @@ -340,5 +340,5 @@ ipc_callid_t callid; - if (!ipc_data_read_receive(&callid, NULL)) { + if (!async_data_read_receive(&callid, NULL)) { fibril_mutex_unlock(&devices_mutex); ipc_answer_0(callid, EINVAL); @@ -367,5 +367,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_read_receive(&callid, &size)) { + if (!async_data_read_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -384,5 +384,5 @@ if (pos < max) { - ipc_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); + async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); } else { ipc_answer_0(callid, ENOENT); @@ -418,5 +418,5 @@ ipc_callid_t callid; - if (!ipc_data_write_receive(&callid, NULL)) { + if (!async_data_write_receive(&callid, NULL)) { fibril_mutex_unlock(&devices_mutex); ipc_answer_0(callid, EINVAL); Index: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/fs/fat/fat_ops.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -897,5 +897,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -908,5 +908,5 @@ return; } - ipcarg_t retval = ipc_data_write_finalize(callid, opts, size); + ipcarg_t retval = async_data_write_finalize(callid, opts, size); if (retval != EOK) { ipc_answer_0(rid, retval); @@ -1047,5 +1047,5 @@ ipc_callid_t callid; size_t len; - if (!ipc_data_read_receive(&callid, &len)) { + if (!async_data_read_receive(&callid, &len)) { fat_node_put(fn); ipc_answer_0(callid, EINVAL); @@ -1066,5 +1066,5 @@ /* reading beyond the EOF */ bytes = 0; - (void) ipc_data_read_finalize(callid, NULL, 0); + (void) async_data_read_finalize(callid, NULL, 0); } else { bytes = min(len, bps - pos % bps); @@ -1073,5 +1073,5 @@ BLOCK_FLAGS_NONE); assert(rc == EOK); - (void) ipc_data_read_finalize(callid, b->data + pos % bps, + (void) async_data_read_finalize(callid, b->data + pos % bps, bytes); rc = block_put(b); @@ -1131,5 +1131,5 @@ return; hit: - (void) ipc_data_read_finalize(callid, name, str_size(name) + 1); + (void) async_data_read_finalize(callid, name, str_size(name) + 1); bytes = (pos - spos) + 1; } @@ -1169,5 +1169,5 @@ ipc_callid_t callid; size_t len; - if (!ipc_data_write_receive(&callid, &len)) { + if (!async_data_write_receive(&callid, &len)) { fat_node_put(fn); ipc_answer_0(callid, EINVAL); @@ -1204,5 +1204,5 @@ rc = fat_block_get(&b, bs, nodep, pos / bps, flags); assert(rc == EOK); - (void) ipc_data_write_finalize(callid, b->data + pos % bps, + (void) async_data_write_finalize(callid, b->data + pos % bps, bytes); b->dirty = true; /* need to sync block */ @@ -1241,5 +1241,5 @@ flags); assert(rc == EOK); - (void) ipc_data_write_finalize(callid, b->data + pos % bps, + (void) async_data_write_finalize(callid, b->data + pos % bps, bytes); b->dirty = true; /* need to sync block */ Index: uspace/srv/fs/tmpfs/tmpfs_ops.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_ops.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/fs/tmpfs/tmpfs_ops.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -389,5 +389,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -400,5 +400,5 @@ return; } - ipcarg_t retval = ipc_data_write_finalize(callid, opts, size); + ipcarg_t retval = async_data_write_finalize(callid, opts, size); if (retval != EOK) { ipc_answer_0(rid, retval); @@ -467,5 +467,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_read_receive(&callid, &size)) { + if (!async_data_read_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -476,5 +476,5 @@ if (nodep->type == TMPFS_FILE) { bytes = max(0, min(nodep->size - pos, size)); - (void) ipc_data_read_finalize(callid, nodep->data + pos, + (void) async_data_read_finalize(callid, nodep->data + pos, bytes); } else { @@ -503,5 +503,5 @@ dentryp = list_get_instance(lnk, tmpfs_dentry_t, link); - (void) ipc_data_read_finalize(callid, dentryp->name, + (void) async_data_read_finalize(callid, dentryp->name, str_size(dentryp->name) + 1); bytes = 1; @@ -541,5 +541,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -552,5 +552,5 @@ if (pos + size <= nodep->size) { /* The file size is not changing. */ - (void) ipc_data_write_finalize(callid, nodep->data + pos, size); + (void) async_data_write_finalize(callid, nodep->data + pos, size); ipc_answer_2(rid, EOK, size, nodep->size); return; @@ -574,5 +574,5 @@ nodep->size += delta; nodep->data = newdata; - (void) ipc_data_write_finalize(callid, nodep->data + pos, size); + (void) async_data_write_finalize(callid, nodep->data + pos, size); ipc_answer_2(rid, EOK, size, nodep->size); } Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/loader/main.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -102,5 +102,5 @@ task_id = task_get_id(); - if (!ipc_data_read_receive(&callid, &len)) { + if (!async_data_read_receive(&callid, &len)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -111,5 +111,5 @@ len = sizeof(task_id); - ipc_data_read_finalize(callid, &task_id, len); + async_data_read_finalize(callid, &task_id, len); ipc_answer_0(rid, EOK); } @@ -127,5 +127,5 @@ char *name_buf; - if (!ipc_data_write_receive(&callid, &len)) { + if (!async_data_write_receive(&callid, &len)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -140,5 +140,5 @@ } - ipc_data_write_finalize(callid, name_buf, len); + async_data_write_finalize(callid, name_buf, len); ipc_answer_0(rid, EOK); @@ -164,5 +164,5 @@ int n; - if (!ipc_data_write_receive(&callid, &buf_size)) { + if (!async_data_write_receive(&callid, &buf_size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -187,5 +187,5 @@ } - ipc_data_write_finalize(callid, arg_buf, buf_size); + async_data_write_finalize(callid, arg_buf, buf_size); arg_buf[buf_size] = '\0'; @@ -239,5 +239,5 @@ ipc_callid_t callid; size_t buf_size; - if (!ipc_data_write_receive(&callid, &buf_size)) { + if (!async_data_write_receive(&callid, &buf_size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -268,5 +268,5 @@ } - ipc_data_write_finalize(callid, fil_buf, buf_size); + async_data_write_finalize(callid, fil_buf, buf_size); int count = buf_size / sizeof(fdi_node_t); Index: uspace/srv/part/mbr_part/mbr_part.c =================================================================== --- uspace/srv/part/mbr_part/mbr_part.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/part/mbr_part/mbr_part.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -419,5 +419,5 @@ ipc_answer_0(iid, EOK); - if (!ipc_share_out_receive(&callid, &comm_size, &flags)) { + if (!async_share_out_receive(&callid, &comm_size, &flags)) { ipc_answer_0(callid, EHANGUP); return; @@ -430,5 +430,5 @@ } - (void) ipc_share_out_finalize(callid, fs_va); + (void) async_share_out_finalize(callid, fs_va); while (1) { Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/vfs/vfs_ops.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -125,5 +125,5 @@ (ipcarg_t) dev_handle, &answer); /* send the mount options */ - rc = ipc_data_write_start(phone, (void *)opts, + rc = async_data_write_start(phone, (void *)opts, str_size(opts)); if (rc != EOK) { @@ -207,5 +207,5 @@ /* send the mount options */ - rc = ipc_data_write_start(phone, (void *)opts, str_size(opts)); + rc = async_data_write_start(phone, (void *)opts, str_size(opts)); if (rc != EOK) { async_wait_for(msg, NULL); @@ -268,5 +268,5 @@ ipc_callid_t callid; size_t size; - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -290,5 +290,5 @@ /* Deliver the mount point. */ - ipcarg_t retval = ipc_data_write_finalize(callid, mp, size); + ipcarg_t retval = async_data_write_finalize(callid, mp, size); if (retval != EOK) { ipc_answer_0(rid, retval); @@ -299,5 +299,5 @@ /* Now we expect to receive the mount options. */ - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -324,5 +324,5 @@ /* Deliver the mount options. */ - retval = ipc_data_write_finalize(callid, opts, size); + retval = async_data_write_finalize(callid, opts, size); if (retval != EOK) { ipc_answer_0(rid, retval); @@ -337,5 +337,5 @@ * system. */ - if (!ipc_data_write_receive(&callid, &size)) { + if (!async_data_write_receive(&callid, &size)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -370,5 +370,5 @@ /* Deliver the file system name. */ - retval = ipc_data_write_finalize(callid, fs_name, size); + retval = async_data_write_finalize(callid, fs_name, size); if (retval != EOK) { ipc_answer_0(rid, retval); @@ -469,5 +469,5 @@ ipc_callid_t callid; - if (!ipc_data_write_receive(&callid, &len)) { + if (!async_data_write_receive(&callid, &len)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -483,5 +483,5 @@ int rc; - if ((rc = ipc_data_write_finalize(callid, path, len))) { + if ((rc = async_data_write_finalize(callid, path, len))) { ipc_answer_0(rid, rc); free(path); @@ -747,7 +747,7 @@ int res; if (read) - res = ipc_data_read_receive(&callid, NULL); + res = async_data_read_receive(&callid, NULL); else - res = ipc_data_write_receive(&callid, NULL); + res = async_data_write_receive(&callid, NULL); if (!res) { ipc_answer_0(callid, EINVAL); @@ -943,5 +943,5 @@ ipc_callid_t callid; - if (!ipc_data_read_receive(&callid, NULL)) { + if (!async_data_read_receive(&callid, NULL)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -969,5 +969,5 @@ ipc_callid_t callid; - if (!ipc_data_write_receive(&callid, &len)) { + if (!async_data_write_receive(&callid, &len)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -981,5 +981,5 @@ } int rc; - if ((rc = ipc_data_write_finalize(callid, path, len))) { + if ((rc = async_data_write_finalize(callid, path, len))) { ipc_answer_0(rid, rc); free(path); @@ -988,5 +988,5 @@ path[len] = '\0'; - if (!ipc_data_read_receive(&callid, NULL)) { + if (!async_data_read_receive(&callid, NULL)) { free(path); ipc_answer_0(callid, EINVAL); @@ -1037,5 +1037,5 @@ ipc_callid_t callid; - if (!ipc_data_write_receive(&callid, &len)) { + if (!async_data_write_receive(&callid, &len)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -1049,5 +1049,5 @@ } int rc; - if ((rc = ipc_data_write_finalize(callid, path, len))) { + if ((rc = async_data_write_finalize(callid, path, len))) { ipc_answer_0(rid, rc); free(path); @@ -1074,5 +1074,5 @@ ipc_callid_t callid; - if (!ipc_data_write_receive(&callid, &len)) { + if (!async_data_write_receive(&callid, &len)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -1086,5 +1086,5 @@ } int rc; - if ((rc = ipc_data_write_finalize(callid, path, len))) { + if ((rc = async_data_write_finalize(callid, path, len))) { ipc_answer_0(rid, rc); free(path); @@ -1125,5 +1125,5 @@ /* Retrieve the old path. */ - if (!ipc_data_write_receive(&callid, &olen)) { + if (!async_data_write_receive(&callid, &olen)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -1136,5 +1136,5 @@ return; } - if ((rc = ipc_data_write_finalize(callid, old, olen))) { + if ((rc = async_data_write_finalize(callid, old, olen))) { ipc_answer_0(rid, rc); free(old); @@ -1144,5 +1144,5 @@ /* Retrieve the new path. */ - if (!ipc_data_write_receive(&callid, &nlen)) { + if (!async_data_write_receive(&callid, &nlen)) { ipc_answer_0(callid, EINVAL); ipc_answer_0(rid, EINVAL); @@ -1157,5 +1157,5 @@ return; } - if ((rc = ipc_data_write_finalize(callid, new, nlen))) { + if ((rc = async_data_write_finalize(callid, new, nlen))) { ipc_answer_0(rid, rc); free(old); Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision f563126931ea083d74828e89fd20f24e40d63b00) +++ uspace/srv/vfs/vfs_register.c (revision ba8f8cb33992cd7d978511d0e9192a299ffcaf3b) @@ -122,5 +122,5 @@ * 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,5 +163,5 @@ 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,5 +229,5 @@ */ - 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,5 +257,5 @@ * 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);