Index: uspace/lib/fs/libfs.c =================================================================== --- uspace/lib/fs/libfs.c (revision 3c22f7021df532f9625f32db5da18694b800e183) +++ uspace/lib/fs/libfs.c (revision 8add9ca54eed14da25f4bda28ab137bf14388de8) @@ -40,5 +40,4 @@ #include #include -#include #include #include @@ -58,5 +57,5 @@ #define answer_and_return(rid, rc) \ do { \ - ipc_answer_0((rid), (rc)); \ + async_answer_0((rid), (rc)); \ return; \ } while (0) @@ -102,6 +101,5 @@ * Ask VFS for callback connection. */ - sysarg_t taskhash; - ipc_connect_to_me(vfs_phone, 0, 0, 0, &taskhash, ®->vfs_phonehash); + async_connect_to_me(vfs_phone, 0, 0, 0, conn); /* @@ -128,9 +126,4 @@ async_wait_for(req, NULL); reg->fs_handle = (int) IPC_GET_ARG1(answer); - - /* - * Create a connection fibril to handle the callback connection. - */ - async_new_connection(taskhash, reg->vfs_phonehash, 0, NULL, conn); /* @@ -166,26 +159,26 @@ if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECTION_CLONE) || (mountee_phone < 0)) { - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } /* Acknowledge the mountee_phone */ - ipc_answer_0(callid, EOK); + async_answer_0(callid, EOK); fs_node_t *fn; res = ops->node_get(&fn, mp_devmap_handle, mp_fs_index); if ((res != EOK) || (!fn)) { - ipc_hangup(mountee_phone); + async_hangup(mountee_phone); async_data_write_void(combine_rc(res, ENOENT)); - ipc_answer_0(rid, combine_rc(res, ENOENT)); + async_answer_0(rid, combine_rc(res, ENOENT)); return; } if (fn->mp_data.mp_active) { - ipc_hangup(mountee_phone); + async_hangup(mountee_phone); (void) ops->node_put(fn); async_data_write_void(EBUSY); - ipc_answer_0(rid, EBUSY); + async_answer_0(rid, EBUSY); return; } @@ -193,8 +186,8 @@ rc = async_req_0_0(mountee_phone, IPC_M_CONNECT_ME); if (rc != EOK) { - ipc_hangup(mountee_phone); + async_hangup(mountee_phone); (void) ops->node_put(fn); async_data_write_void(rc); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); return; } @@ -214,5 +207,5 @@ * Do not release the FS node so that it stays in memory. */ - ipc_answer_3(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer), + async_answer_3(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer), IPC_GET_ARG3(answer)); } @@ -227,5 +220,5 @@ res = ops->node_get(&fn, mp_devmap_handle, mp_fs_index); if ((res != EOK) || (!fn)) { - ipc_answer_0(rid, combine_rc(res, ENOENT)); + async_answer_0(rid, combine_rc(res, ENOENT)); return; } @@ -236,5 +229,5 @@ if (!fn->mp_data.mp_active) { (void) ops->node_put(fn); - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -250,5 +243,5 @@ */ if (res == EOK) { - ipc_hangup(fn->mp_data.phone); + async_hangup(fn->mp_data.phone); fn->mp_data.mp_active = false; fn->mp_data.fs_handle = 0; @@ -260,5 +253,5 @@ (void) ops->node_put(fn); - ipc_answer_0(rid, res); + async_answer_0(rid, res); } @@ -300,5 +293,5 @@ if (cur->mp_data.mp_active) { - ipc_forward_slow(rid, cur->mp_data.phone, VFS_OUT_LOOKUP, + async_forward_slow(rid, cur->mp_data.phone, VFS_OUT_LOOKUP, next, last, cur->mp_data.devmap_handle, lflag, index, IPC_FF_ROUTE_FROM_ME); @@ -324,5 +317,5 @@ if (len + 1 == NAME_MAX) { /* Component length overflow */ - ipc_answer_0(rid, ENAMETOOLONG); + async_answer_0(rid, ENAMETOOLONG); goto out; } @@ -358,5 +351,5 @@ next--; - ipc_forward_slow(rid, tmp->mp_data.phone, + async_forward_slow(rid, tmp->mp_data.phone, VFS_OUT_LOOKUP, next, last, tmp->mp_data.devmap_handle, lflag, index, IPC_FF_ROUTE_FROM_ME); @@ -372,5 +365,5 @@ if (next <= last) { /* There are unprocessed components */ - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); goto out; } @@ -380,5 +373,5 @@ /* Request to create a new link */ if (!ops->is_directory(cur)) { - ipc_answer_0(rid, ENOTDIR); + async_answer_0(rid, ENOTDIR); goto out; } @@ -398,8 +391,8 @@ if (lflag & L_CREATE) (void) ops->destroy(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } else { aoff64_t size = ops->size_get(fn); - ipc_answer_5(rid, fs_handle, + async_answer_5(rid, fs_handle, devmap_handle, ops->index_get(fn), @@ -410,10 +403,10 @@ } } else - ipc_answer_0(rid, ENOSPC); + async_answer_0(rid, ENOSPC); goto out; } - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); goto out; } @@ -441,5 +434,5 @@ if (lflag & (L_CREATE | L_LINK)) { if (!ops->is_directory(cur)) { - ipc_answer_0(rid, ENOTDIR); + async_answer_0(rid, ENOTDIR); goto out; } @@ -450,5 +443,5 @@ if (ops->plb_get_char(next) == '/') { /* More than one component */ - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); goto out; } @@ -456,5 +449,5 @@ if (len + 1 == NAME_MAX) { /* Component length overflow */ - ipc_answer_0(rid, ENAMETOOLONG); + async_answer_0(rid, ENAMETOOLONG); goto out; } @@ -480,8 +473,8 @@ if (lflag & L_CREATE) (void) ops->destroy(fn); - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } else { aoff64_t size = ops->size_get(fn); - ipc_answer_5(rid, fs_handle, + async_answer_5(rid, fs_handle, devmap_handle, ops->index_get(fn), @@ -492,10 +485,10 @@ } } else - ipc_answer_0(rid, ENOSPC); + async_answer_0(rid, ENOSPC); goto out; } - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); goto out; } @@ -510,9 +503,9 @@ if (rc == EOK) { aoff64_t size = ops->size_get(cur); - ipc_answer_5(rid, fs_handle, devmap_handle, + async_answer_5(rid, fs_handle, devmap_handle, ops->index_get(cur), LOWER32(size), UPPER32(size), old_lnkcnt); } else - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); goto out; @@ -521,20 +514,20 @@ if (((lflag & (L_CREATE | L_EXCLUSIVE)) == (L_CREATE | L_EXCLUSIVE)) || (lflag & L_LINK)) { - ipc_answer_0(rid, EEXIST); + async_answer_0(rid, EEXIST); goto out; } if ((lflag & L_FILE) && (ops->is_directory(cur))) { - ipc_answer_0(rid, EISDIR); + async_answer_0(rid, EISDIR); goto out; } if ((lflag & L_DIRECTORY) && (ops->is_file(cur))) { - ipc_answer_0(rid, ENOTDIR); + async_answer_0(rid, ENOTDIR); goto out; } if ((lflag & L_ROOT) && par) { - ipc_answer_0(rid, EINVAL); + async_answer_0(rid, EINVAL); goto out; } @@ -548,12 +541,12 @@ if (rc == EOK) { aoff64_t size = ops->size_get(cur); - ipc_answer_5(rid, fs_handle, devmap_handle, + async_answer_5(rid, fs_handle, devmap_handle, ops->index_get(cur), LOWER32(size), UPPER32(size), ops->lnkcnt_get(cur)); } else - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); } else - ipc_answer_0(rid, rc); + async_answer_0(rid, rc); out: @@ -584,6 +577,6 @@ (size != sizeof(struct stat))) { ops->node_put(fn); - ipc_answer_0(callid, EINVAL); - ipc_answer_0(rid, EINVAL); + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); return; } @@ -604,5 +597,5 @@ async_data_read_finalize(callid, &stat, sizeof(struct stat)); - ipc_answer_0(rid, EOK); + async_answer_0(rid, EOK); } @@ -626,5 +619,5 @@ if (fn == NULL) { - ipc_answer_0(rid, ENOENT); + async_answer_0(rid, ENOENT); return; } @@ -632,5 +625,5 @@ rc = ops->node_open(fn); aoff64_t size = ops->size_get(fn); - ipc_answer_4(rid, rc, LOWER32(size), UPPER32(size), ops->lnkcnt_get(fn), + async_answer_4(rid, rc, LOWER32(size), UPPER32(size), ops->lnkcnt_get(fn), (ops->is_file(fn) ? L_FILE : 0) | (ops->is_directory(fn) ? L_DIRECTORY : 0)); Index: uspace/lib/fs/libfs.h =================================================================== --- uspace/lib/fs/libfs.h (revision 3c22f7021df532f9625f32db5da18694b800e183) +++ uspace/lib/fs/libfs.h (revision 8add9ca54eed14da25f4bda28ab137bf14388de8) @@ -39,5 +39,4 @@ #include #include -#include #include #include @@ -86,5 +85,4 @@ typedef struct { int fs_handle; /**< File system handle. */ - sysarg_t vfs_phonehash; /**< Initial VFS phonehash. */ uint8_t *plb_ro; /**< Read-only PLB view. */ } fs_reg_t;