| /trunk/uspace/srv/fs/fat/fat_idx.c |
|---|
| 436,6 → 436,19 |
| futex_up(&used_futex); |
| } |
| void fat_idx_hashout(fat_idx_t *idx) |
| { |
| unsigned long pkey[] = { |
| [UPH_DH_KEY] = idx->dev_handle, |
| [UPH_PFC_KEY] = idx->pfc, |
| [UPH_PDI_KEY] = idx->pdi, |
| }; |
| futex_down(&used_futex); |
| hash_table_remove(&up_hash, pkey, 3); |
| futex_up(&used_futex); |
| } |
| fat_idx_t * |
| fat_idx_get_by_index(dev_handle_t dev_handle, fs_index_t index) |
| { |
| /trunk/uspace/srv/fs/fat/fat.h |
|---|
| 210,6 → 210,7 |
| extern fat_idx_t *fat_idx_get_by_index(dev_handle_t, fs_index_t); |
| extern void fat_idx_destroy(fat_idx_t *); |
| extern void fat_idx_hashin(fat_idx_t *); |
| extern void fat_idx_hashout(fat_idx_t *); |
| extern int fat_idx_init(void); |
| extern void fat_idx_fini(void); |
| /trunk/uspace/srv/fs/fat/fat_dentry.c |
|---|
| 39,13 → 39,6 |
| #include <ctype.h> |
| #include <string.h> |
| #define FAT_PAD ' ' |
| #define FAT_DENTRY_UNUSED 0x00 |
| #define FAT_DENTRY_E5_ESC 0x05 |
| #define FAT_DENTRY_DOT 0x2e |
| #define FAT_DENTRY_ERASED 0xe5 |
| static bool is_d_char(const char ch) |
| { |
| if (isalnum(ch) || ch == '_') |
| /trunk/uspace/srv/fs/fat/fat_dentry.h |
|---|
| 43,6 → 43,13 |
| #define FAT_ATTR_VOLLABEL (1 << 3) |
| #define FAT_ATTR_SUBDIR (1 << 4) |
| #define FAT_PAD ' ' |
| #define FAT_DENTRY_UNUSED 0x00 |
| #define FAT_DENTRY_E5_ESC 0x05 |
| #define FAT_DENTRY_DOT 0x2e |
| #define FAT_DENTRY_ERASED 0xe5 |
| typedef enum { |
| FAT_DENTRY_SKIP, |
| FAT_DENTRY_LAST, |
| /trunk/uspace/srv/fs/fat/fat_ops.c |
|---|
| 479,7 → 479,42 |
| int fat_unlink(void *prnt, void *chld) |
| { |
| return ENOTSUP; /* not supported at the moment */ |
| fat_node_t *parentp = (fat_node_t *)prnt; |
| fat_node_t *childp = (fat_node_t *)chld; |
| fat_bs_t *bs; |
| fat_dentry_t *d; |
| uint16_t bps; |
| block_t *b; |
| futex_down(&parentp->lock); |
| futex_down(&childp->lock); |
| assert(childp->lnkcnt == 1); |
| futex_down(&childp->idx->lock); |
| bs = block_bb_get(childp->idx->dev_handle); |
| bps = uint16_t_le2host(bs->bps); |
| b = _fat_block_get(bs, childp->idx->dev_handle, childp->idx->pfc, |
| (childp->idx->pdi * sizeof(fat_dentry_t)) / bps, |
| BLOCK_FLAGS_NONE); |
| d = (fat_dentry_t *)b->data + |
| (childp->idx->pdi % (bps / sizeof(fat_dentry_t))); |
| /* mark the dentry as not-currently-used */ |
| d->name[0] = FAT_DENTRY_ERASED; |
| b->dirty = true; /* need to sync block */ |
| block_put(b); |
| /* remove the index structure from the position hash */ |
| fat_idx_hashout(childp->idx); |
| /* clear position information */ |
| childp->idx->pfc = FAT_CLST_RES0; |
| childp->idx->pdi = 0; |
| futex_up(&childp->idx->lock); |
| childp->lnkcnt = 0; |
| childp->dirty = true; |
| futex_up(&childp->lock); |
| futex_up(&parentp->lock); |
| return EOK; |
| } |
| void *fat_match(void *prnt, const char *component) |