| 71,8 → 71,11 |
|---|
| { |
| dev_handle_t dev_handle; |
| vfs_node_t *mp_node = NULL; |
| ipc_callid_t callid; |
| ipc_call_t data; |
| int rc; |
| int phone; |
| size_t size; |
| |
| /* |
| * We expect the library to do the device-name to device-handle |
| 86,9 → 89,6 |
|---|
| * carry mount options in the future. |
| */ |
| |
| ipc_callid_t callid; |
| size_t size; |
| |
| /* |
| * Now, we expect the client to send us data with the name of the file |
| * system. |
| 115,15 → 115,30 |
|---|
| fs_name[size] = '\0'; |
| |
| /* |
| * Wait for IPC_M_PING so that we can return an error if we don't know |
| * fs_name. |
| */ |
| callid = async_get_call(&data); |
| if (IPC_GET_METHOD(data) != IPC_M_PING) { |
| ipc_answer_0(callid, ENOTSUP); |
| ipc_answer_0(rid, ENOTSUP); |
| return; |
| } |
| |
| /* |
| * Check if we know a file system with the same name as is in fs_name. |
| * This will also give us its file system handle. |
| */ |
| fs_handle_t fs_handle = fs_name_to_handle(fs_name, true); |
| if (!fs_handle) { |
| ipc_answer_0(callid, ENOENT); |
| ipc_answer_0(rid, ENOENT); |
| return; |
| } |
| |
| /* Acknowledge that we know fs_name. */ |
| ipc_answer_0(callid, EOK); |
| |
| /* Now, we want the client to send us the mount point. */ |
| if (!ipc_data_write_receive(&callid, &size)) { |
| ipc_answer_0(callid, EINVAL); |
| 190,6 → 205,12 |
|---|
| } else { |
| /* We still don't have the root file system mounted. */ |
| if ((size == 1) && (buf[0] == '/')) { |
| vfs_lookup_res_t mr_res; |
| vfs_node_t *mr_node; |
| ipcarg_t rindex; |
| ipcarg_t rsize; |
| ipcarg_t rlnkcnt; |
| |
| /* |
| * For this simple, but important case, |
| * we are almost done. |
| 198,16 → 219,30 |
|---|
| |
| /* Tell the mountee that it is being mounted. */ |
| phone = vfs_grab_phone(fs_handle); |
| rc = async_req_1_0(phone, VFS_MOUNTED, |
| (ipcarg_t) dev_handle); |
| rc = async_req_1_3(phone, VFS_MOUNTED, |
| (ipcarg_t) dev_handle, &rindex, &rsize, &rlnkcnt); |
| vfs_release_phone(phone); |
| |
| if (rc == EOK) { |
| rootfs.fs_handle = fs_handle; |
| rootfs.dev_handle = dev_handle; |
| |
| if (rc != EOK) { |
| futex_up(&rootfs_futex); |
| ipc_answer_0(rid, rc); |
| return; |
| } |
| |
| mr_res.triplet.fs_handle = fs_handle; |
| mr_res.triplet.dev_handle = dev_handle; |
| mr_res.triplet.index = (fs_index_t) rindex; |
| mr_res.size = (size_t) rsize; |
| mr_res.lnkcnt = (unsigned) rlnkcnt; |
| |
| rootfs.fs_handle = fs_handle; |
| rootfs.dev_handle = dev_handle; |
| futex_up(&rootfs_futex); |
| |
| /* Add reference to the mounted root. */ |
| mr_node = vfs_node_get(&mr_res); |
| assert(mr_node); |
| |
| ipc_answer_0(rid, rc); |
| return; |
| } else { |
| 374,12 → 409,8 |
|---|
| void vfs_close(ipc_callid_t rid, ipc_call_t *request) |
| { |
| int fd = IPC_GET_ARG1(*request); |
| if (fd >= MAX_OPEN_FILES) { |
| ipc_answer_0(rid, EBADF); |
| return; |
| } |
| vfs_fd_free(fd); |
| ipc_answer_0(rid, EOK); |
| int rc = vfs_fd_free(fd); |
| ipc_answer_0(rid, rc); |
| } |
| |
| static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read) |