46,6 → 46,7 |
#include <libadt/hash_table.h> |
#include <libadt/list.h> |
#include <assert.h> |
#include <futex.h> |
|
#define BS_BLOCK 0 |
|
52,6 → 53,9 |
#define FIN_KEY_DEV_HANDLE 0 |
#define FIN_KEY_INDEX 1 |
|
/** Futex protecting both fin_hash and ffn_head. */ |
futex_t fin_futex = FUTEX_INITIALIZER; |
|
/** Hash table of FAT in-core nodes. */ |
hash_table_t fin_hash; |
|
118,6 → 122,7 |
|
static void fat_node_initialize(fat_node_t *node) |
{ |
futex_initialize(&node->lock, 1); |
node->type = 0; |
node->index = 0; |
node->pindex = 0; |
200,6 → 205,7 |
[FIN_KEY_INDEX] = index |
}; |
|
futex_down(&fin_futex); |
lnk = hash_table_find(&fin_hash, key); |
if (lnk) { |
/* |
208,6 → 214,12 |
node = hash_table_get_instance(lnk, fat_node_t, fin_link); |
if (!node->refcnt++) |
list_remove(&node->ffn_link); |
futex_up(&fin_futex); |
|
/* Make sure that the node is fully instantiated. */ |
futex_down(&node->lock); |
futex_up(&node->lock); |
|
return (void *) node; |
} |
|
241,8 → 253,19 |
node->dev_handle = dev_handle; |
node->index = index; |
node->pindex = pindex; |
key[FIN_KEY_DEV_HANDLE] = node->dev_handle; |
key[FIN_KEY_INDEX] = node->index; |
hash_table_insert(&fin_hash, key, &node->fin_link); |
|
/* |
* We have already put the node back to fin_hash. |
* The node is not yet fully instantiated so we lock it prior to |
* unlocking fin_hash. |
*/ |
futex_down(&node->lock); |
futex_up(&fin_futex); |
|
/* |
* Because of the design of the FAT file system, we have no clue about |
* how big (i.e. how many directory entries it contains) is the parent |
* of the node we are trying to instantiate. However, we know that it |
269,10 → 292,7 |
node->size = uint32_t_le2host(d->size); |
block_put(b); |
|
key[FIN_KEY_DEV_HANDLE] = node->dev_handle; |
key[FIN_KEY_INDEX] = node->index; |
hash_table_insert(&fin_hash, key, &node->fin_link); |
|
futex_up(&node->lock); |
return node; |
} |
|
280,8 → 300,10 |
{ |
fat_node_t *nodep = (fat_node_t *)node; |
|
if (nodep->refcnt-- == 1) |
futex_down(&fin_futex); |
if (!--nodep->refcnt) |
list_append(&nodep->ffn_link, &ffn_head); |
futex_up(&fin_futex); |
} |
|
static void *fat_match(void *prnt, const char *component) |