Changeset 15f3c3f in mainline for uspace/srv/vfs/vfs_ops.c
- Timestamp:
- 2011-06-22T22:00:52Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 86ffa27f
- Parents:
- ef09a7a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/vfs/vfs_ops.c
ref09a7a r15f3c3f 54 54 55 55 /* Forward declarations of static functions. */ 56 static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t,56 static int vfs_truncate_internal(fs_handle_t, service_id_t, fs_index_t, 57 57 aoff64_t); 58 58 … … 65 65 vfs_pair_t rootfs = { 66 66 .fs_handle = 0, 67 . devmap_handle= 067 .service_id = 0 68 68 }; 69 69 70 static void vfs_mount_internal(ipc_callid_t rid, devmap_handle_t devmap_handle,70 static void vfs_mount_internal(ipc_callid_t rid, service_id_t service_id, 71 71 fs_handle_t fs_handle, char *mp, char *opts) 72 72 { … … 125 125 exch = vfs_exchange_grab(fs_handle); 126 126 msg = async_send_1(exch, VFS_OUT_MOUNTED, 127 (sysarg_t) devmap_handle, &answer);127 (sysarg_t) service_id, &answer); 128 128 /* Send the mount options */ 129 129 rc = async_data_write_start(exch, (void *)opts, … … 150 150 151 151 mr_res.triplet.fs_handle = fs_handle; 152 mr_res.triplet. devmap_handle = devmap_handle;152 mr_res.triplet.service_id = service_id; 153 153 mr_res.triplet.index = rindex; 154 154 mr_res.size = rsize; … … 157 157 158 158 rootfs.fs_handle = fs_handle; 159 rootfs. devmap_handle = devmap_handle;159 rootfs.service_id = service_id; 160 160 161 161 /* Add reference to the mounted root. */ … … 178 178 179 179 /* 180 * At this point, we have all necessary pieces: file system and device181 * handles, and we know the mount point VFS node.180 * At this point, we have all necessary pieces: file system handle 181 * and service ID, and we know the mount point VFS node. 182 182 */ 183 183 … … 187 187 exch = vfs_exchange_grab(mp_res.triplet.fs_handle); 188 188 msg = async_send_4(exch, VFS_OUT_MOUNT, 189 (sysarg_t) mp_res.triplet. devmap_handle,189 (sysarg_t) mp_res.triplet.service_id, 190 190 (sysarg_t) mp_res.triplet.index, 191 191 (sysarg_t) fs_handle, 192 (sysarg_t) devmap_handle, &answer);192 (sysarg_t) service_id, &answer); 193 193 194 194 /* Send connection */ … … 233 233 234 234 mr_res.triplet.fs_handle = fs_handle; 235 mr_res.triplet. devmap_handle = devmap_handle;235 mr_res.triplet.service_id = service_id; 236 236 mr_res.triplet.index = rindex; 237 237 mr_res.size = rsize; … … 254 254 void vfs_mount(ipc_callid_t rid, ipc_call_t *request) 255 255 { 256 devmap_handle_t devmap_handle;256 service_id_t service_id; 257 257 258 258 /* … … 261 261 * in the request. 262 262 */ 263 devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);263 service_id = (service_id_t) IPC_GET_ARG1(*request); 264 264 265 265 /* … … 349 349 350 350 /* Do the mount */ 351 vfs_mount_internal(rid, devmap_handle, fs_handle, mp, opts);351 vfs_mount_internal(rid, service_id, fs_handle, mp, opts); 352 352 free(mp); 353 353 free(fs_name); … … 408 408 */ 409 409 if (vfs_nodes_refcount_sum_get(mr_node->fs_handle, 410 mr_node-> devmap_handle) != 2) {410 mr_node->service_id) != 2) { 411 411 fibril_rwlock_write_unlock(&namespace_rwlock); 412 412 vfs_node_put(mr_node); … … 429 429 exch = vfs_exchange_grab(mr_node->fs_handle); 430 430 rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED, 431 mr_node-> devmap_handle);431 mr_node->service_id); 432 432 vfs_exchange_release(exch); 433 433 … … 440 440 441 441 rootfs.fs_handle = 0; 442 rootfs. devmap_handle= 0;442 rootfs.service_id = 0; 443 443 } else { 444 444 … … 469 469 exch = vfs_exchange_grab(mp_node->fs_handle); 470 470 rc = async_req_2_0(exch, VFS_OUT_UNMOUNT, 471 mp_node-> devmap_handle, mp_node->index);471 mp_node->service_id, mp_node->index); 472 472 vfs_exchange_release(exch); 473 473 … … 574 574 if (node->size) { 575 575 rc = vfs_truncate_internal(node->fs_handle, 576 node-> devmap_handle, node->index, 0);576 node->service_id, node->index, 0); 577 577 if (rc) { 578 578 fibril_rwlock_write_unlock(&node->contents_rwlock); … … 627 627 628 628 lr.triplet.fs_handle = IPC_GET_ARG1(*request); 629 lr.triplet. devmap_handle= IPC_GET_ARG2(*request);629 lr.triplet.service_id = IPC_GET_ARG2(*request); 630 630 lr.triplet.index = IPC_GET_ARG3(*request); 631 631 int oflag = IPC_GET_ARG4(*request); … … 648 648 if (node->size) { 649 649 rc = vfs_truncate_internal(node->fs_handle, 650 node-> devmap_handle, node->index, 0);650 node->service_id, node->index, 0); 651 651 if (rc) { 652 652 fibril_rwlock_write_unlock(&node->contents_rwlock); … … 711 711 aid_t msg; 712 712 ipc_call_t answer; 713 msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node-> devmap_handle,713 msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node->service_id, 714 714 file->node->index, &answer); 715 715 … … 796 796 if (read) { 797 797 rc = async_data_read_forward_3_1(fs_exch, VFS_OUT_READ, 798 file->node-> devmap_handle, file->node->index, file->pos,798 file->node->service_id, file->node->index, file->pos, 799 799 &answer); 800 800 } else { … … 803 803 804 804 rc = async_data_write_forward_3_1(fs_exch, VFS_OUT_WRITE, 805 file->node-> devmap_handle, file->node->index, file->pos,805 file->node->service_id, file->node->index, file->pos, 806 806 &answer); 807 807 } … … 933 933 } 934 934 935 int vfs_truncate_internal(fs_handle_t fs_handle, devmap_handle_t devmap_handle,935 int vfs_truncate_internal(fs_handle_t fs_handle, service_id_t service_id, 936 936 fs_index_t index, aoff64_t size) 937 937 { 938 938 async_exch_t *exch = vfs_exchange_grab(fs_handle); 939 939 sysarg_t rc = async_req_4_0(exch, VFS_OUT_TRUNCATE, 940 (sysarg_t) devmap_handle, (sysarg_t) index, LOWER32(size),940 (sysarg_t) service_id, (sysarg_t) index, LOWER32(size), 941 941 UPPER32(size)); 942 942 vfs_exchange_release(exch); … … 961 961 fibril_rwlock_write_lock(&file->node->contents_rwlock); 962 962 rc = vfs_truncate_internal(file->node->fs_handle, 963 file->node-> devmap_handle, file->node->index, size);963 file->node->service_id, file->node->index, size); 964 964 if (rc == EOK) 965 965 file->node->size = size; … … 995 995 996 996 aid_t msg; 997 msg = async_send_3(exch, VFS_OUT_STAT, file->node-> devmap_handle,997 msg = async_send_3(exch, VFS_OUT_STAT, file->node->service_id, 998 998 file->node->index, true, NULL); 999 999 async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); … … 1048 1048 1049 1049 aid_t msg; 1050 msg = async_send_3(exch, VFS_OUT_STAT, node-> devmap_handle,1050 msg = async_send_3(exch, VFS_OUT_STAT, node->service_id, 1051 1051 node->index, false, NULL); 1052 1052 async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); … … 1225 1225 /* Check whether linking to the same file system instance. */ 1226 1226 if ((old_node->fs_handle != new_par_lr.triplet.fs_handle) || 1227 (old_node-> devmap_handle != new_par_lr.triplet.devmap_handle)) {1227 (old_node->service_id != new_par_lr.triplet.service_id)) { 1228 1228 fibril_rwlock_write_unlock(&namespace_rwlock); 1229 1229 vfs_node_put(old_node);
Note:
See TracChangeset
for help on using the changeset viewer.