Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 4fe94c669d1b57c6e7167bd6698ff567b70797ca) +++ uspace/srv/vfs/vfs_ops.c (revision d81ef61cee954e3114d2e6b6bce5b1033605c7c8) @@ -37,5 +37,4 @@ #include "vfs.h" -#include #include #include @@ -91,5 +90,5 @@ /* Trying to mount root FS over root FS */ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, EBUSY); + async_answer_0(rid, EBUSY); return; } @@ -99,5 +98,5 @@ /* The lookup failed for some reason. */ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -106,5 +105,5 @@ if (!mp_node) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -134,5 +133,5 @@ vfs_release_phone(fs_handle, phone); fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -142,5 +141,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -165,5 +164,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } else { @@ -173,5 +172,5 @@ */ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -202,5 +201,5 @@ if (mp_node) vfs_node_put(mp_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); fibril_rwlock_write_unlock(&namespace_rwlock); return; @@ -218,5 +217,5 @@ vfs_node_put(mp_node); fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -245,5 +244,5 @@ } - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); fibril_rwlock_write_unlock(&namespace_rwlock); } @@ -275,5 +274,5 @@ 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -285,5 +284,5 @@ if (rc != EOK) { free(mp); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -299,5 +298,5 @@ free(mp); free(opts); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -310,6 +309,6 @@ ipc_callid_t callid = async_get_call(&data); if (IPC_GET_IMETHOD(data) != IPC_M_PING) { - ipc_answer_0(callid, ENOTSUP); - ipc_answer_0(rid, ENOTSUP); + async_answer_0(callid, ENOTSUP); + async_answer_0(rid, ENOTSUP); free(mp); free(opts); @@ -333,6 +332,6 @@ fibril_mutex_unlock(&fs_head_lock); - ipc_answer_0(callid, ENOENT); - ipc_answer_0(rid, ENOENT); + async_answer_0(callid, ENOENT); + async_answer_0(rid, ENOENT); free(mp); free(fs_name); @@ -343,5 +342,5 @@ /* Acknowledge that we know fs_name. */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); /* Do the mount */ @@ -367,5 +366,5 @@ 0, NULL); if (rc != EOK) - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); /* @@ -386,5 +385,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); free(mp); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -393,5 +392,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); free(mp); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -409,5 +408,5 @@ vfs_node_put(mr_node); free(mp); - ipc_answer_0(rid, EBUSY); + async_answer_0(rid, EBUSY); return; } @@ -430,5 +429,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(mr_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -449,5 +448,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(mr_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -456,5 +455,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(mr_node); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -468,5 +467,5 @@ vfs_node_put(mp_node); vfs_node_put(mr_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -486,5 +485,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -514,5 +513,5 @@ ((lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) || (lflag & (L_OPEN | L_ROOT | L_MP))) { - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -526,5 +525,5 @@ int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -548,5 +547,5 @@ else fibril_rwlock_read_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(path); return; @@ -571,5 +570,5 @@ fibril_rwlock_write_unlock(&node->contents_rwlock); vfs_node_put(node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -586,5 +585,5 @@ if (fd < 0) { vfs_node_put(node); - ipc_answer_0(rid, fd); + async_answer_0(rid, fd); return; } @@ -607,5 +606,5 @@ /* Success! Return the new file descriptor to the client. */ - ipc_answer_1(rid, EOK, fd); + async_answer_1(rid, EOK, fd); } @@ -629,5 +628,5 @@ if (rc != EOK) { fibril_rwlock_read_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -645,5 +644,5 @@ fibril_rwlock_write_unlock(&node->contents_rwlock); vfs_node_put(node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -660,5 +659,5 @@ if (fd < 0) { vfs_node_put(node); - ipc_answer_0(rid, fd); + async_answer_0(rid, fd); return; } @@ -680,5 +679,5 @@ /* Success! Return the new file descriptor to the client. */ - ipc_answer_1(rid, EOK, fd); + async_answer_1(rid, EOK, fd); } @@ -690,5 +689,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -715,5 +714,5 @@ vfs_file_put(file); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -760,5 +759,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -766,9 +765,9 @@ int ret = vfs_close_internal(file); if (ret != EOK) - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); vfs_file_put(file); ret = vfs_fd_free(fd); - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); } @@ -792,5 +791,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -875,5 +874,5 @@ * return to the client. */ - ipc_answer_1(rid, rc, bytes); + async_answer_1(rid, rc, bytes); } @@ -898,5 +897,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -911,5 +910,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_1(rid, EOK, off); + async_answer_1(rid, EOK, off); return; } @@ -919,5 +918,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); return; } @@ -926,5 +925,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); return; } @@ -935,5 +934,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_2(rid, EOK, LOWER32(newoff), + async_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff)); return; @@ -946,5 +945,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); return; } @@ -954,5 +953,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); return; } @@ -964,5 +963,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff)); + async_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff)); return; } @@ -970,5 +969,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); } @@ -995,5 +994,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -1009,5 +1008,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, (sysarg_t)rc); + async_answer_0(rid, (sysarg_t)rc); } @@ -1019,5 +1018,5 @@ vfs_file_t *file = vfs_file_get(fd); if (!file) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -1026,6 +1025,6 @@ if (!async_data_read_receive(&callid, NULL)) { vfs_file_put(file); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -1038,5 +1037,5 @@ msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->devmap_handle, file->node->index, true, NULL); - ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); async_wait_for(msg, &rc); vfs_release_phone(file->node->fs_handle, fs_phone); @@ -1044,5 +1043,5 @@ fibril_mutex_unlock(&file->lock); vfs_file_put(file); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -1052,5 +1051,5 @@ int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1059,6 +1058,6 @@ if (!async_data_read_receive(&callid, NULL)) { free(path); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -1070,6 +1069,6 @@ if (rc != EOK) { fibril_rwlock_read_unlock(&namespace_rwlock); - ipc_answer_0(callid, rc); - ipc_answer_0(rid, rc); + async_answer_0(callid, rc); + async_answer_0(rid, rc); return; } @@ -1077,6 +1076,6 @@ if (!node) { fibril_rwlock_read_unlock(&namespace_rwlock); - ipc_answer_0(callid, ENOMEM); - ipc_answer_0(rid, ENOMEM); + async_answer_0(callid, ENOMEM); + async_answer_0(rid, ENOMEM); return; } @@ -1088,5 +1087,5 @@ msg = async_send_3(fs_phone, VFS_OUT_STAT, node->devmap_handle, node->index, false, NULL); - ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); + async_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); sysarg_t rv; @@ -1094,5 +1093,5 @@ vfs_release_phone(node->fs_handle, fs_phone); - ipc_answer_0(rid, rv); + async_answer_0(rid, rv); vfs_node_put(node); @@ -1106,5 +1105,5 @@ int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1118,5 +1117,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); free(path); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } @@ -1128,5 +1127,5 @@ int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1139,5 +1138,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1154,5 +1153,5 @@ fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(node); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -1163,5 +1162,5 @@ int rc = async_data_write_accept((void **) &old, true, 0, 0, 0, NULL); if (rc != EOK) { - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1172,5 +1171,5 @@ if (rc != EOK) { free(old); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -1182,5 +1181,5 @@ if ((!oldc) || (!newc)) { - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); free(old); free(new); @@ -1201,5 +1200,5 @@ * - oldc and newc are equal. */ - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); free(old); free(new); @@ -1216,5 +1215,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1225,5 +1224,5 @@ if (!old_node) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); free(old); free(new); @@ -1235,5 +1234,5 @@ if (!parentc) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1252,5 +1251,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1262,5 +1261,5 @@ (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, EXDEV); /* different file systems */ + async_answer_0(rid, EXDEV); /* different file systems */ free(old); free(new); @@ -1280,5 +1279,5 @@ if (!new_node) { fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOMEM); + async_answer_0(rid, ENOMEM); free(old); free(new); @@ -1291,5 +1290,5 @@ default: fibril_rwlock_write_unlock(&namespace_rwlock); - ipc_answer_0(rid, ENOTEMPTY); + async_answer_0(rid, ENOTEMPTY); free(old); free(new); @@ -1303,5 +1302,5 @@ if (new_node) vfs_node_put(new_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1320,5 +1319,5 @@ if (new_node) vfs_node_put(new_node); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); free(old); free(new); @@ -1337,5 +1336,5 @@ free(old); free(new); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -1347,5 +1346,5 @@ /* If the file descriptors are the same, do nothing. */ if (oldfd == newfd) { - ipc_answer_1(rid, EOK, newfd); + async_answer_1(rid, EOK, newfd); return; } @@ -1354,5 +1353,5 @@ vfs_file_t *oldfile = vfs_file_get(oldfd); if (!oldfile) { - ipc_answer_0(rid, EBADF); + async_answer_0(rid, EBADF); return; } @@ -1373,5 +1372,5 @@ vfs_file_put(oldfile); vfs_file_put(newfile); - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); return; } @@ -1382,5 +1381,5 @@ vfs_file_put(oldfile); vfs_file_put(newfile); - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); return; } @@ -1394,7 +1393,7 @@ if (ret != EOK) - ipc_answer_0(rid, ret); + async_answer_0(rid, ret); else - ipc_answer_1(rid, EOK, newfd); + async_answer_1(rid, EOK, newfd); }