| 55,6 → 55,9 |
|---|
| #include <sys/mman.h> |
| #include <align.h> |
| |
| #define FAT_NODE(node) ((node) ? (fat_node_t *) (node)->data : NULL) |
| #define FS_NODE(node) ((node) ? (node)->bp : NULL) |
| |
| /** Futex protecting the list of cached free FAT nodes. */ |
| static futex_t ffn_futex = FUTEX_INITIALIZER; |
| |
| 64,6 → 67,7 |
|---|
| static void fat_node_initialize(fat_node_t *node) |
| { |
| futex_initialize(&node->lock, 1); |
| node->bp = NULL; |
| node->idx = NULL; |
| node->type = 0; |
| link_initialize(&node->ffn_link); |
| 108,6 → 112,7 |
|---|
| |
| static fat_node_t *fat_node_get_new(void) |
| { |
| fs_node_t *fn; |
| fat_node_t *nodep; |
| |
| futex_down(&ffn_futex); |
| 129,15 → 134,23 |
|---|
| idxp_tmp->nodep = NULL; |
| futex_up(&nodep->lock); |
| futex_up(&idxp_tmp->lock); |
| fn = FS_NODE(nodep); |
| } else { |
| skip_cache: |
| /* Try to allocate a new node structure. */ |
| futex_up(&ffn_futex); |
| fn = (fs_node_t *)malloc(sizeof(fs_node_t)); |
| if (!fn) |
| return NULL; |
| nodep = (fat_node_t *)malloc(sizeof(fat_node_t)); |
| if (!nodep) |
| if (!nodep) { |
| free(fn); |
| return NULL; |
| } |
| } |
| fat_node_initialize(nodep); |
| fn->data = nodep; |
| nodep->bp = fn; |
| |
| return nodep; |
| } |
| 146,7 → 159,7 |
|---|
| * |
| * @param idxp Locked index structure. |
| */ |
| static void *fat_node_get_core(fat_idx_t *idxp) |
| static fat_node_t *fat_node_get_core(fat_idx_t *idxp) |
| { |
| block_t *b; |
| fat_bs_t *bs; |
| 223,21 → 236,21 |
|---|
| /* |
| * Forward declarations of FAT libfs operations. |
| */ |
| static void *fat_node_get(dev_handle_t, fs_index_t); |
| static void fat_node_put(void *); |
| static void *fat_create_node(dev_handle_t, int); |
| static int fat_destroy_node(void *); |
| static int fat_link(void *, void *, const char *); |
| static int fat_unlink(void *, void *); |
| static void *fat_match(void *, const char *); |
| static fs_index_t fat_index_get(void *); |
| static size_t fat_size_get(void *); |
| static unsigned fat_lnkcnt_get(void *); |
| static bool fat_has_children(void *); |
| static void *fat_root_get(dev_handle_t); |
| static fs_node_t *fat_node_get(dev_handle_t, fs_index_t); |
| static void fat_node_put(fs_node_t *); |
| static fs_node_t *fat_create_node(dev_handle_t, int); |
| static int fat_destroy_node(fs_node_t *); |
| static int fat_link(fs_node_t *, fs_node_t *, const char *); |
| static int fat_unlink(fs_node_t *, fs_node_t *, const char *); |
| static fs_node_t *fat_match(fs_node_t *, const char *); |
| static fs_index_t fat_index_get(fs_node_t *); |
| static size_t fat_size_get(fs_node_t *); |
| static unsigned fat_lnkcnt_get(fs_node_t *); |
| static bool fat_has_children(fs_node_t *); |
| static fs_node_t *fat_root_get(dev_handle_t); |
| static char fat_plb_get_char(unsigned); |
| static bool fat_is_directory(void *); |
| static bool fat_is_file(void *node); |
| static bool fat_is_directory(fs_node_t *); |
| static bool fat_is_file(fs_node_t *node); |
| |
| /* |
| * FAT libfs operations. |
| 244,9 → 257,9 |
|---|
| */ |
| |
| /** Instantiate a FAT in-core node. */ |
| void *fat_node_get(dev_handle_t dev_handle, fs_index_t index) |
| fs_node_t *fat_node_get(dev_handle_t dev_handle, fs_index_t index) |
| { |
| void *node; |
| fat_node_t *nodep; |
| fat_idx_t *idxp; |
| |
| idxp = fat_idx_get_by_index(dev_handle, index); |
| 253,14 → 266,14 |
|---|
| if (!idxp) |
| return NULL; |
| /* idxp->lock held */ |
| node = fat_node_get_core(idxp); |
| nodep = fat_node_get_core(idxp); |
| futex_up(&idxp->lock); |
| return node; |
| return FS_NODE(nodep); |
| } |
| |
| void fat_node_put(void *node) |
| void fat_node_put(fs_node_t *fn) |
| { |
| fat_node_t *nodep = (fat_node_t *)node; |
| fat_node_t *nodep = FAT_NODE(fn); |
| bool destroy = false; |
| |
| futex_down(&nodep->lock); |
| 280,11 → 293,13 |
|---|
| } |
| } |
| futex_up(&nodep->lock); |
| if (destroy) |
| free(node); |
| if (destroy) { |
| free(nodep->bp); |
| free(nodep); |
| } |
| } |
| |
| void *fat_create_node(dev_handle_t dev_handle, int flags) |
| fs_node_t *fat_create_node(dev_handle_t dev_handle, int flags) |
| { |
| fat_idx_t *idxp; |
| fat_node_t *nodep; |
| 310,7 → 325,7 |
|---|
| idxp = fat_idx_get_new(dev_handle); |
| if (!idxp) { |
| fat_free_clusters(bs, dev_handle, mcl); |
| fat_node_put(nodep); |
| fat_node_put(FS_NODE(nodep)); |
| return NULL; |
| } |
| /* idxp->lock held */ |
| 345,12 → 360,12 |
|---|
| idxp->nodep = nodep; |
| |
| futex_up(&idxp->lock); |
| return nodep; |
| return FS_NODE(nodep); |
| } |
| |
| int fat_destroy_node(void *node) |
| int fat_destroy_node(fs_node_t *fn) |
| { |
| fat_node_t *nodep = (fat_node_t *)node; |
| fat_node_t *nodep = FAT_NODE(fn); |
| fat_bs_t *bs; |
| |
| /* |
| 364,7 → 379,7 |
|---|
| /* |
| * The node may not have any children. |
| */ |
| assert(fat_has_children(node) == false); |
| assert(fat_has_children(fn) == false); |
| |
| bs = block_bb_get(nodep->idx->dev_handle); |
| if (nodep->firstc != FAT_CLST_RES0) { |
| 374,14 → 389,15 |
|---|
| } |
| |
| fat_idx_destroy(nodep->idx); |
| free(nodep->bp); |
| free(nodep); |
| return EOK; |
| } |
| |
| int fat_link(void *prnt, void *chld, const char *name) |
| int fat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name) |
| { |
| fat_node_t *parentp = (fat_node_t *)prnt; |
| fat_node_t *childp = (fat_node_t *)chld; |
| fat_node_t *parentp = FAT_NODE(pfn); |
| fat_node_t *childp = FAT_NODE(cfn); |
| fat_dentry_t *d; |
| fat_bs_t *bs; |
| block_t *b; |
| 389,6 → 405,8 |
|---|
| uint16_t bps; |
| unsigned dps; |
| unsigned blocks; |
| fat_cluster_t mcl, lcl; |
| int rc; |
| |
| futex_down(&childp->lock); |
| if (childp->lnkcnt == 1) { |
| 437,19 → 455,36 |
|---|
| } |
| block_put(b); |
| } |
| j = 0; |
| |
| /* |
| * We need to grow the parent in order to create a new unused dentry. |
| */ |
| futex_up(&parentp->idx->lock); |
| return ENOTSUP; /* XXX */ |
| if (parentp->idx->pfc == FAT_CLST_ROOT) { |
| /* Can't grow the root directory. */ |
| futex_up(&parentp->idx->lock); |
| return ENOSPC; |
| } |
| rc = fat_alloc_clusters(bs, parentp->idx->dev_handle, 1, &mcl, &lcl); |
| if (rc != EOK) { |
| futex_up(&parentp->idx->lock); |
| return rc; |
| } |
| fat_append_clusters(bs, parentp, mcl); |
| b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NOREAD); |
| d = (fat_dentry_t *)b->data; |
| /* |
| * Clear all dentries in the block except for the first one (the first |
| * dentry will be cleared in the next step). |
| */ |
| memset(d + 1, 0, bps - sizeof(fat_dentry_t)); |
| |
| hit: |
| /* |
| * At this point we only establish the link between the parent and the |
| * child. The dentry, except of the name and the extension, will remain |
| * uninitialized until the the corresponding node is synced. Thus the |
| * valid dentry data is kept in the child node structure. |
| * uninitialized until the corresponding node is synced. Thus the valid |
| * dentry data is kept in the child node structure. |
| */ |
| memset(d, 0, sizeof(fat_dentry_t)); |
| fat_dentry_name_set(d, name); |
| 468,10 → 503,10 |
|---|
| b = fat_block_get(bs, childp, 0, BLOCK_FLAGS_NONE); |
| d = (fat_dentry_t *)b->data; |
| if (fat_classify_dentry(d) == FAT_DENTRY_LAST || |
| strcmp(d->name, FAT_NAME_DOT) == 0) { |
| str_cmp(d->name, FAT_NAME_DOT) == 0) { |
| memset(d, 0, sizeof(fat_dentry_t)); |
| strcpy(d->name, FAT_NAME_DOT); |
| strcpy(d->ext, FAT_EXT_PAD); |
| str_cpy(d->name, 8, FAT_NAME_DOT); |
| str_cpy(d->ext, 3, FAT_EXT_PAD); |
| d->attr = FAT_ATTR_SUBDIR; |
| d->firstc = host2uint16_t_le(childp->firstc); |
| /* TODO: initialize also the date/time members. */ |
| 478,10 → 513,10 |
|---|
| } |
| d++; |
| if (fat_classify_dentry(d) == FAT_DENTRY_LAST || |
| strcmp(d->name, FAT_NAME_DOT_DOT) == 0) { |
| str_cmp(d->name, FAT_NAME_DOT_DOT) == 0) { |
| memset(d, 0, sizeof(fat_dentry_t)); |
| strcpy(d->name, FAT_NAME_DOT_DOT); |
| strcpy(d->ext, FAT_EXT_PAD); |
| str_cpy(d->name, 8, FAT_NAME_DOT_DOT); |
| str_cpy(d->ext, 3, FAT_EXT_PAD); |
| d->attr = FAT_ATTR_SUBDIR; |
| d->firstc = (parentp->firstc == FAT_CLST_ROOT) ? |
| host2uint16_t_le(FAT_CLST_RES0) : |
| 508,15 → 543,21 |
|---|
| return EOK; |
| } |
| |
| int fat_unlink(void *prnt, void *chld) |
| int fat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm) |
| { |
| fat_node_t *parentp = (fat_node_t *)prnt; |
| fat_node_t *childp = (fat_node_t *)chld; |
| fat_node_t *parentp = FAT_NODE(pfn); |
| fat_node_t *childp = FAT_NODE(cfn); |
| fat_bs_t *bs; |
| fat_dentry_t *d; |
| uint16_t bps; |
| block_t *b; |
| |
| if (!parentp) |
| return EBUSY; |
| |
| if (fat_has_children(cfn)) |
| return ENOTEMPTY; |
| |
| futex_down(&parentp->lock); |
| futex_down(&childp->lock); |
| assert(childp->lnkcnt == 1); |
| 548,10 → 589,10 |
|---|
| return EOK; |
| } |
| |
| void *fat_match(void *prnt, const char *component) |
| fs_node_t *fat_match(fs_node_t *pfn, const char *component) |
| { |
| fat_bs_t *bs; |
| fat_node_t *parentp = (fat_node_t *)prnt; |
| fat_node_t *parentp = FAT_NODE(pfn); |
| char name[FAT_NAME_LEN + 1 + FAT_EXT_LEN + 1]; |
| unsigned i, j; |
| unsigned bps; /* bytes per sector */ |
| 584,7 → 625,7 |
|---|
| } |
| if (fat_dentry_namecmp(name, component) == 0) { |
| /* hit */ |
| void *node; |
| fat_node_t *nodep; |
| /* |
| * Assume tree hierarchy for locking. We |
| * already have the parent and now we are going |
| 603,10 → 644,10 |
|---|
| block_put(b); |
| return NULL; |
| } |
| node = fat_node_get_core(idx); |
| nodep = fat_node_get_core(idx); |
| futex_up(&idx->lock); |
| block_put(b); |
| return node; |
| return FS_NODE(nodep); |
| } |
| } |
| block_put(b); |
| 616,28 → 657,25 |
|---|
| return NULL; |
| } |
| |
| fs_index_t fat_index_get(void *node) |
| fs_index_t fat_index_get(fs_node_t *fn) |
| { |
| fat_node_t *fnodep = (fat_node_t *)node; |
| if (!fnodep) |
| return 0; |
| return fnodep->idx->index; |
| return FAT_NODE(fn)->idx->index; |
| } |
| |
| size_t fat_size_get(void *node) |
| size_t fat_size_get(fs_node_t *fn) |
| { |
| return ((fat_node_t *)node)->size; |
| return FAT_NODE(fn)->size; |
| } |
| |
| unsigned fat_lnkcnt_get(void *node) |
| unsigned fat_lnkcnt_get(fs_node_t *fn) |
| { |
| return ((fat_node_t *)node)->lnkcnt; |
| return FAT_NODE(fn)->lnkcnt; |
| } |
| |
| bool fat_has_children(void *node) |
| bool fat_has_children(fs_node_t *fn) |
| { |
| fat_bs_t *bs; |
| fat_node_t *nodep = (fat_node_t *)node; |
| fat_node_t *nodep = FAT_NODE(fn); |
| unsigned bps; |
| unsigned dps; |
| unsigned blocks; |
| 685,7 → 723,7 |
|---|
| return false; |
| } |
| |
| void *fat_root_get(dev_handle_t dev_handle) |
| fs_node_t *fat_root_get(dev_handle_t dev_handle) |
| { |
| return fat_node_get(dev_handle, 0); |
| } |
| 695,14 → 733,14 |
|---|
| return fat_reg.plb_ro[pos % PLB_SIZE]; |
| } |
| |
| bool fat_is_directory(void *node) |
| bool fat_is_directory(fs_node_t *fn) |
| { |
| return ((fat_node_t *)node)->type == FAT_DIRECTORY; |
| return FAT_NODE(fn)->type == FAT_DIRECTORY; |
| } |
| |
| bool fat_is_file(void *node) |
| bool fat_is_file(fs_node_t *fn) |
| { |
| return ((fat_node_t *)node)->type == FAT_FILE; |
| return FAT_NODE(fn)->type == FAT_FILE; |
| } |
| |
| /** libfs operations */ |
| 736,6 → 774,28 |
|---|
| uint16_t rde; |
| int rc; |
| |
| /* accept the mount options */ |
| ipc_callid_t callid; |
| size_t size; |
| if (!ipc_data_write_receive(&callid, &size)) { |
| ipc_answer_0(callid, EINVAL); |
| ipc_answer_0(rid, EINVAL); |
| return; |
| } |
| char *opts = malloc(size + 1); |
| if (!opts) { |
| ipc_answer_0(callid, ENOMEM); |
| ipc_answer_0(rid, ENOMEM); |
| return; |
| } |
| ipcarg_t retval = ipc_data_write_finalize(callid, opts, size); |
| if (retval != EOK) { |
| ipc_answer_0(rid, retval); |
| free(opts); |
| return; |
| } |
| opts[size] = '\0'; |
| |
| /* initialize libblock */ |
| rc = block_init(dev_handle, BS_SIZE); |
| if (rc != EOK) { |
| 780,8 → 840,16 |
|---|
| } |
| |
| /* Initialize the root node. */ |
| fs_node_t *rfn = (fs_node_t *)malloc(sizeof(fs_node_t)); |
| if (!rfn) { |
| block_fini(dev_handle); |
| fat_idx_fini_by_dev_handle(dev_handle); |
| ipc_answer_0(rid, ENOMEM); |
| return; |
| } |
| fat_node_t *rootp = (fat_node_t *)malloc(sizeof(fat_node_t)); |
| if (!rootp) { |
| free(rfn); |
| block_fini(dev_handle); |
| fat_idx_fini_by_dev_handle(dev_handle); |
| ipc_answer_0(rid, ENOMEM); |
| 791,8 → 859,9 |
|---|
| |
| fat_idx_t *ridxp = fat_idx_get_by_pos(dev_handle, FAT_CLST_ROOTPAR, 0); |
| if (!ridxp) { |
| free(rfn); |
| free(rootp); |
| block_fini(dev_handle); |
| free(rootp); |
| fat_idx_fini_by_dev_handle(dev_handle); |
| ipc_answer_0(rid, ENOMEM); |
| return; |
| 807,6 → 876,8 |
|---|
| rootp->size = rde * sizeof(fat_dentry_t); |
| rootp->idx = ridxp; |
| ridxp->nodep = rootp; |
| rootp->bp = rfn; |
| rfn->data = rootp; |
| |
| futex_up(&ridxp->lock); |
| |
| 828,21 → 899,23 |
|---|
| dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request); |
| fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request); |
| off_t pos = (off_t)IPC_GET_ARG3(*request); |
| fat_node_t *nodep = (fat_node_t *)fat_node_get(dev_handle, index); |
| fs_node_t *fn = fat_node_get(dev_handle, index); |
| fat_node_t *nodep; |
| fat_bs_t *bs; |
| uint16_t bps; |
| size_t bytes; |
| block_t *b; |
| |
| if (!nodep) { |
| if (!fn) { |
| ipc_answer_0(rid, ENOENT); |
| return; |
| } |
| nodep = FAT_NODE(fn); |
| |
| ipc_callid_t callid; |
| size_t len; |
| if (!ipc_data_read_receive(&callid, &len)) { |
| fat_node_put(nodep); |
| fat_node_put(fn); |
| ipc_answer_0(callid, EINVAL); |
| ipc_answer_0(rid, EINVAL); |
| return; |
| 913,16 → 986,16 |
|---|
| bnum++; |
| } |
| miss: |
| fat_node_put(nodep); |
| fat_node_put(fn); |
| ipc_answer_0(callid, ENOENT); |
| ipc_answer_1(rid, ENOENT, 0); |
| return; |
| hit: |
| (void) ipc_data_read_finalize(callid, name, strlen(name) + 1); |
| (void) ipc_data_read_finalize(callid, name, str_size(name) + 1); |
| bytes = (pos - spos) + 1; |
| } |
| |
| fat_node_put(nodep); |
| fat_node_put(fn); |
| ipc_answer_1(rid, EOK, (ipcarg_t)bytes); |
| } |
| |
| 931,7 → 1004,8 |
|---|
| dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request); |
| fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request); |
| off_t pos = (off_t)IPC_GET_ARG3(*request); |
| fat_node_t *nodep = (fat_node_t *)fat_node_get(dev_handle, index); |
| fs_node_t *fn = fat_node_get(dev_handle, index); |
| fat_node_t *nodep; |
| fat_bs_t *bs; |
| size_t bytes; |
| block_t *b; |
| 941,15 → 1015,16 |
|---|
| off_t boundary; |
| int flags = BLOCK_FLAGS_NONE; |
| |
| if (!nodep) { |
| if (!fn) { |
| ipc_answer_0(rid, ENOENT); |
| return; |
| } |
| nodep = FAT_NODE(fn); |
| |
| ipc_callid_t callid; |
| size_t len; |
| if (!ipc_data_write_receive(&callid, &len)) { |
| fat_node_put(nodep); |
| fat_node_put(fn); |
| ipc_answer_0(callid, EINVAL); |
| ipc_answer_0(rid, EINVAL); |
| return; |
| 990,7 → 1065,7 |
|---|
| nodep->dirty = true; /* need to sync node */ |
| } |
| ipc_answer_2(rid, EOK, bytes, nodep->size); |
| fat_node_put(nodep); |
| fat_node_put(fn); |
| return; |
| } else { |
| /* |
| 1006,7 → 1081,7 |
|---|
| status = fat_alloc_clusters(bs, dev_handle, nclsts, &mcl, &lcl); |
| if (status != EOK) { |
| /* could not allocate a chain of nclsts clusters */ |
| fat_node_put(nodep); |
| fat_node_put(fn); |
| ipc_answer_0(callid, status); |
| ipc_answer_0(rid, status); |
| return; |
| 1027,7 → 1102,7 |
|---|
| nodep->size = pos + bytes; |
| nodep->dirty = true; /* need to sync node */ |
| ipc_answer_2(rid, EOK, bytes, nodep->size); |
| fat_node_put(nodep); |
| fat_node_put(fn); |
| return; |
| } |
| } |
| 1037,7 → 1112,8 |
|---|
| dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request); |
| fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request); |
| size_t size = (off_t)IPC_GET_ARG3(*request); |
| fat_node_t *nodep = (fat_node_t *)fat_node_get(dev_handle, index); |
| fs_node_t *fn = fat_node_get(dev_handle, index); |
| fat_node_t *nodep; |
| fat_bs_t *bs; |
| uint16_t bps; |
| uint8_t spc; |
| 1044,10 → 1120,11 |
|---|
| unsigned bpc; /* bytes per cluster */ |
| int rc; |
| |
| if (!nodep) { |
| if (!fn) { |
| ipc_answer_0(rid, ENOENT); |
| return; |
| } |
| nodep = FAT_NODE(fn); |
| |
| bs = block_bb_get(dev_handle); |
| bps = uint16_t_le2host(bs->bps); |
| 1085,7 → 1162,7 |
|---|
| nodep->dirty = true; /* need to sync node */ |
| rc = EOK; |
| } |
| fat_node_put(nodep); |
| fat_node_put(fn); |
| ipc_answer_0(rid, rc); |
| return; |
| } |
| 1096,13 → 1173,13 |
|---|
| fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request); |
| int rc; |
| |
| fat_node_t *nodep = fat_node_get(dev_handle, index); |
| if (!nodep) { |
| fs_node_t *fn = fat_node_get(dev_handle, index); |
| if (!fn) { |
| ipc_answer_0(rid, ENOENT); |
| return; |
| } |
| |
| rc = fat_destroy_node(nodep); |
| rc = fat_destroy_node(fn); |
| ipc_answer_0(rid, rc); |
| } |
| |