Changes in uspace/lib/fs/libfs.c [efcebe1:9934f7d] in mainline
- File:
-
- 1 edited
-
uspace/lib/fs/libfs.c (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/fs/libfs.c
refcebe1 r9934f7d 45 45 #include <mem.h> 46 46 #include <sys/stat.h> 47 #include <stdlib.h>48 47 49 48 #define on_error(rc, action) \ … … 62 61 } while (0) 63 62 64 static fs_reg_t reg;65 66 static vfs_out_ops_t *vfs_out_ops = NULL;67 static libfs_ops_t *libfs_ops = NULL;68 69 static void libfs_mount(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);70 static void libfs_unmount(libfs_ops_t *, ipc_callid_t, ipc_call_t *);71 static void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t,72 ipc_call_t *);73 static void libfs_stat(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);74 static void libfs_open_node(libfs_ops_t *, fs_handle_t, ipc_callid_t,75 ipc_call_t *);76 77 static void vfs_out_mounted(ipc_callid_t rid, ipc_call_t *req)78 {79 devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req);80 char *opts;81 int rc;82 83 /* Accept the mount options. */84 rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);85 if (rc != EOK) {86 async_answer_0(rid, rc);87 return;88 }89 90 fs_index_t index;91 aoff64_t size;92 unsigned lnkcnt;93 rc = vfs_out_ops->mounted(devmap_handle, opts, &index, &size, &lnkcnt);94 95 if (rc == EOK) // FIXME: size is 64-bit96 async_answer_3(rid, EOK, index, size, lnkcnt);97 else98 async_answer_0(rid, rc);99 100 free(opts);101 }102 103 static void vfs_out_mount(ipc_callid_t rid, ipc_call_t *req)104 {105 libfs_mount(libfs_ops, reg.fs_handle, rid, req);106 }107 108 static void vfs_out_unmounted(ipc_callid_t rid, ipc_call_t *req)109 {110 devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req);111 int rc;112 113 rc = vfs_out_ops->unmounted(devmap_handle);114 115 async_answer_0(rid, rc);116 }117 118 static void vfs_out_unmount(ipc_callid_t rid, ipc_call_t *req)119 {120 121 libfs_unmount(libfs_ops, rid, req);122 }123 124 static void vfs_out_lookup(ipc_callid_t rid, ipc_call_t *req)125 {126 libfs_lookup(libfs_ops, reg.fs_handle, rid, req);127 }128 129 static void vfs_out_read(ipc_callid_t rid, ipc_call_t *req)130 {131 devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req);132 fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);133 aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*req),134 IPC_GET_ARG4(*req));135 size_t rbytes;136 int rc;137 138 rc = vfs_out_ops->read(devmap_handle, index, pos, &rbytes);139 140 if (rc == EOK)141 async_answer_1(rid, EOK, rbytes);142 else143 async_answer_0(rid, rc);144 }145 146 static void vfs_out_write(ipc_callid_t rid, ipc_call_t *req)147 {148 devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req);149 fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);150 aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*req),151 IPC_GET_ARG4(*req));152 size_t wbytes;153 aoff64_t nsize;154 int rc;155 156 rc = vfs_out_ops->write(devmap_handle, index, pos, &wbytes, &nsize);157 158 if (rc == EOK) // FIXME: nsize is 64-bit159 async_answer_2(rid, EOK, wbytes, nsize);160 else161 async_answer_0(rid, rc);162 }163 164 static void vfs_out_truncate(ipc_callid_t rid, ipc_call_t *req)165 {166 devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req);167 fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);168 aoff64_t size = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*req),169 IPC_GET_ARG4(*req));170 int rc;171 172 rc = vfs_out_ops->truncate(devmap_handle, index, size);173 174 async_answer_0(rid, rc);175 }176 177 static void vfs_out_close(ipc_callid_t rid, ipc_call_t *req)178 {179 devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req);180 fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);181 int rc;182 183 rc = vfs_out_ops->close(devmap_handle, index);184 185 async_answer_0(rid, rc);186 }187 188 static void vfs_out_destroy(ipc_callid_t rid, ipc_call_t *req)189 {190 devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req);191 fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);192 int rc;193 194 rc = vfs_out_ops->destroy(devmap_handle, index);195 196 async_answer_0(rid, rc);197 }198 199 static void vfs_out_open_node(ipc_callid_t rid, ipc_call_t *req)200 {201 libfs_open_node(libfs_ops, reg.fs_handle, rid, req);202 }203 204 static void vfs_out_stat(ipc_callid_t rid, ipc_call_t *req)205 {206 libfs_stat(libfs_ops, reg.fs_handle, rid, req);207 }208 209 static void vfs_out_sync(ipc_callid_t rid, ipc_call_t *req)210 {211 devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req);212 fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);213 int rc;214 215 rc = vfs_out_ops->sync(devmap_handle, index);216 217 async_answer_0(rid, rc);218 }219 220 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)221 {222 if (iid) {223 /*224 * This only happens for connections opened by225 * IPC_M_CONNECT_ME_TO calls as opposed to callback connections226 * created by IPC_M_CONNECT_TO_ME.227 */228 async_answer_0(iid, EOK);229 }230 231 while (true) {232 ipc_call_t call;233 ipc_callid_t callid = async_get_call(&call);234 235 if (!IPC_GET_IMETHOD(call))236 return;237 238 switch (IPC_GET_IMETHOD(call)) {239 case VFS_OUT_MOUNTED:240 vfs_out_mounted(callid, &call);241 break;242 case VFS_OUT_MOUNT:243 vfs_out_mount(callid, &call);244 break;245 case VFS_OUT_UNMOUNTED:246 vfs_out_unmounted(callid, &call);247 break;248 case VFS_OUT_UNMOUNT:249 vfs_out_unmount(callid, &call);250 break;251 case VFS_OUT_LOOKUP:252 vfs_out_lookup(callid, &call);253 break;254 case VFS_OUT_READ:255 vfs_out_read(callid, &call);256 break;257 case VFS_OUT_WRITE:258 vfs_out_write(callid, &call);259 break;260 case VFS_OUT_TRUNCATE:261 vfs_out_truncate(callid, &call);262 break;263 case VFS_OUT_CLOSE:264 vfs_out_close(callid, &call);265 break;266 case VFS_OUT_DESTROY:267 vfs_out_destroy(callid, &call);268 break;269 case VFS_OUT_OPEN_NODE:270 vfs_out_open_node(callid, &call);271 break;272 case VFS_OUT_STAT:273 vfs_out_stat(callid, &call);274 break;275 case VFS_OUT_SYNC:276 vfs_out_sync(callid, &call);277 break;278 default:279 async_answer_0(callid, ENOTSUP);280 break;281 }282 }283 }284 285 63 /** Register file system server. 286 64 * … … 290 68 * 291 69 * @param sess Session for communication with VFS. 70 * @param reg File system registration structure. It will be 71 * initialized by this function. 292 72 * @param info VFS info structure supplied by the file system 293 73 * implementation. 294 * @param vops Address of the vfs_out_ops_t structure.295 * @param lops Address of the libfs_ops_t structure.74 * @param conn Connection fibril for handling all calls originating in 75 * VFS. 296 76 * 297 77 * @return EOK on success or a non-zero error code on errror. 298 78 * 299 79 */ 300 int fs_register(async_sess_t *sess, vfs_info_t *info, vfs_out_ops_t *vops,301 libfs_ops_t *lops)80 int fs_register(async_sess_t *sess, fs_reg_t *reg, vfs_info_t *info, 81 async_client_conn_t conn) 302 82 { 303 83 /* … … 324 104 325 105 /* 326 * Set VFS_OUT and libfs operations.327 */328 vfs_out_ops = vops;329 libfs_ops = lops;330 331 /*332 106 * Ask VFS for callback connection. 333 107 */ 334 async_connect_to_me(exch, 0, 0, 0, vfs_connection, NULL);108 async_connect_to_me(exch, 0, 0, 0, conn, NULL); 335 109 336 110 /* 337 111 * Allocate piece of address space for PLB. 338 112 */ 339 reg .plb_ro = as_get_mappable_page(PLB_SIZE);340 if (!reg .plb_ro) {113 reg->plb_ro = as_get_mappable_page(PLB_SIZE); 114 if (!reg->plb_ro) { 341 115 async_exchange_end(exch); 342 116 async_wait_for(req, NULL); … … 347 121 * Request sharing the Path Lookup Buffer with VFS. 348 122 */ 349 rc = async_share_in_start_0_0(exch, reg .plb_ro, PLB_SIZE);123 rc = async_share_in_start_0_0(exch, reg->plb_ro, PLB_SIZE); 350 124 351 125 async_exchange_end(exch); … … 360 134 */ 361 135 async_wait_for(req, NULL); 362 reg .fs_handle = (int) IPC_GET_ARG1(answer);136 reg->fs_handle = (int) IPC_GET_ARG1(answer); 363 137 364 138 /* … … 366 140 * the same connection fibril as well. 367 141 */ 368 async_set_client_connection( vfs_connection);142 async_set_client_connection(conn); 369 143 370 144 return IPC_GET_RETVAL(answer); … … 377 151 378 152 void libfs_mount(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid, 379 ipc_call_t *req )153 ipc_call_t *request) 380 154 { 381 devmap_handle_t mp_devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req );382 fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*req );383 fs_handle_t mr_fs_handle = (fs_handle_t) IPC_GET_ARG3(*req );384 devmap_handle_t mr_devmap_handle = (devmap_handle_t) IPC_GET_ARG4(*req );155 devmap_handle_t mp_devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request); 156 fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request); 157 fs_handle_t mr_fs_handle = (fs_handle_t) IPC_GET_ARG3(*request); 158 devmap_handle_t mr_devmap_handle = (devmap_handle_t) IPC_GET_ARG4(*request); 385 159 386 160 async_sess_t *mountee_sess = async_clone_receive(EXCHANGE_PARALLEL); … … 438 212 } 439 213 440 void libfs_unmount(libfs_ops_t *ops, ipc_callid_t rid, ipc_call_t *req )214 void libfs_unmount(libfs_ops_t *ops, ipc_callid_t rid, ipc_call_t *request) 441 215 { 442 devmap_handle_t mp_devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*req );443 fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*req );216 devmap_handle_t mp_devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request); 217 fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request); 444 218 fs_node_t *fn; 445 219 int res; … … 485 259 } 486 260 487 static char plb_get_char(unsigned pos)488 {489 return reg.plb_ro[pos % PLB_SIZE];490 }491 492 261 /** Lookup VFS triplet by name in the file system name space. 493 262 * … … 504 273 */ 505 274 void libfs_lookup(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid, 506 ipc_call_t *req )275 ipc_call_t *request) 507 276 { 508 unsigned int first = IPC_GET_ARG1(*req );509 unsigned int last = IPC_GET_ARG2(*req );277 unsigned int first = IPC_GET_ARG1(*request); 278 unsigned int last = IPC_GET_ARG2(*request); 510 279 unsigned int next = first; 511 devmap_handle_t devmap_handle = IPC_GET_ARG3(*req );512 int lflag = IPC_GET_ARG4(*req );513 fs_index_t index = IPC_GET_ARG5(*req );280 devmap_handle_t devmap_handle = IPC_GET_ARG3(*request); 281 int lflag = IPC_GET_ARG4(*request); 282 fs_index_t index = IPC_GET_ARG5(*request); 514 283 char component[NAME_MAX + 1]; 515 284 int len; … … 529 298 async_exch_t *exch = async_exchange_begin(cur->mp_data.sess); 530 299 async_forward_slow(rid, exch, VFS_OUT_LOOKUP, next, last, 531 cur->mp_data.devmap_handle, lflag, index, 532 IPC_FF_ROUTE_FROM_ME); 300 cur->mp_data.devmap_handle, lflag, index, IPC_FF_ROUTE_FROM_ME); 533 301 async_exchange_end(exch); 534 302 … … 538 306 539 307 /* Eat slash */ 540 if ( plb_get_char(next) == '/')308 if (ops->plb_get_char(next) == '/') 541 309 next++; 542 310 … … 551 319 /* Collect the component */ 552 320 len = 0; 553 while ((next <= last) && ( plb_get_char(next) != '/')) {321 while ((next <= last) && (ops->plb_get_char(next) != '/')) { 554 322 if (len + 1 == NAME_MAX) { 555 323 /* Component length overflow */ … … 557 325 goto out; 558 326 } 559 component[len++] = plb_get_char(next);327 component[len++] = ops->plb_get_char(next); 560 328 /* Process next character */ 561 329 next++; … … 589 357 590 358 async_exch_t *exch = async_exchange_begin(tmp->mp_data.sess); 591 async_forward_slow(rid, exch, VFS_OUT_LOOKUP, next, 592 last,tmp->mp_data.devmap_handle, lflag, index,359 async_forward_slow(rid, exch, VFS_OUT_LOOKUP, next, last, 360 tmp->mp_data.devmap_handle, lflag, index, 593 361 IPC_FF_ROUTE_FROM_ME); 594 362 async_exchange_end(exch); … … 683 451 len = 0; 684 452 while (next <= last) { 685 if ( plb_get_char(next) == '/') {453 if (ops->plb_get_char(next) == '/') { 686 454 /* More than one component */ 687 455 async_answer_0(rid, ENOENT); … … 695 463 } 696 464 697 component[len++] = plb_get_char(next);465 component[len++] = ops->plb_get_char(next); 698 466 /* Process next character */ 699 467 next++; … … 869 637 rc = ops->node_open(fn); 870 638 aoff64_t size = ops->size_get(fn); 871 async_answer_4(rid, rc, LOWER32(size), UPPER32(size), 872 ops->lnkcnt_get(fn), 639 async_answer_4(rid, rc, LOWER32(size), UPPER32(size), ops->lnkcnt_get(fn), 873 640 (ops->is_file(fn) ? L_FILE : 0) | (ops->is_directory(fn) ? L_DIRECTORY : 0)); 874 641
Note:
See TracChangeset
for help on using the changeset viewer.
