| /branches/dynload/uspace/srv/vfs/vfs_ops.c |
|---|
| 234,6 → 234,7 |
| mr_res.triplet.index = (fs_index_t) rindex; |
| mr_res.size = (size_t) rsize; |
| mr_res.lnkcnt = (unsigned) rlnkcnt; |
| mr_res.type = VFS_NODE_DIRECTORY; |
| rootfs.fs_handle = fs_handle; |
| rootfs.dev_handle = dev_handle; |
| 302,6 → 303,16 |
| int mode = IPC_GET_ARG3(*request); |
| size_t len; |
| /* |
| * Make sure that we are called with exactly one of L_FILE and |
| * L_DIRECTORY. |
| */ |
| if ((lflag & (L_FILE | L_DIRECTORY)) == 0 || |
| (lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) { |
| ipc_answer_0(rid, EINVAL); |
| return; |
| } |
| if (oflag & O_CREAT) |
| lflag |= L_CREATE; |
| if (oflag & O_EXCL) |
| 456,7 → 467,7 |
| * the same open file at a time. |
| */ |
| futex_down(&file->lock); |
| /* |
| * Lock the file's node so that no other client can read/write to it at |
| * the same time. |
| 465,6 → 476,15 |
| rwlock_read_lock(&file->node->contents_rwlock); |
| else |
| rwlock_write_lock(&file->node->contents_rwlock); |
| if (file->node->type == VFS_NODE_DIRECTORY) { |
| /* |
| * Make sure that no one is modifying the namespace |
| * while we are in readdir(). |
| */ |
| assert(read); |
| rwlock_read_lock(&namespace_rwlock); |
| } |
| int fs_phone = vfs_grab_phone(file->node->fs_handle); |
| 490,6 → 510,9 |
| ipcarg_t rc; |
| async_wait_for(msg, &rc); |
| size_t bytes = IPC_GET_ARG1(answer); |
| if (file->node->type == VFS_NODE_DIRECTORY) |
| rwlock_read_unlock(&namespace_rwlock); |
| /* Unlock the VFS node. */ |
| if (read) |
| /branches/dynload/uspace/srv/vfs/vfs.h |
|---|
| 190,8 → 190,15 |
| */ |
| #define L_PARENT 64 |
| typedef enum vfs_node_type { |
| VFS_NODE_UNKNOWN, |
| VFS_NODE_FILE, |
| VFS_NODE_DIRECTORY, |
| } vfs_node_type_t; |
| typedef struct { |
| vfs_triplet_t triplet; |
| vfs_node_type_t type; |
| size_t size; |
| unsigned lnkcnt; |
| } vfs_lookup_res_t; |
| 213,6 → 220,9 |
| unsigned lnkcnt; |
| link_t nh_link; /**< Node hash-table link. */ |
| vfs_node_type_t type; /**< Partial info about the node type. */ |
| size_t size; /**< Cached size if the node is a file. */ |
| /** |
| /branches/dynload/uspace/srv/vfs/vfs_node.c |
|---|
| 175,15 → 175,22 |
| node->index = result->triplet.index; |
| node->size = result->size; |
| node->lnkcnt = result->lnkcnt; |
| node->type = result->type; |
| link_initialize(&node->nh_link); |
| rwlock_initialize(&node->contents_rwlock); |
| hash_table_insert(&nodes, key, &node->nh_link); |
| } else { |
| node = hash_table_get_instance(tmp, vfs_node_t, nh_link); |
| if (node->type == VFS_NODE_UNKNOWN && |
| result->type != VFS_NODE_UNKNOWN) { |
| /* Upgrade the node type. */ |
| node->type = result->type; |
| } |
| } |
| assert(node->size == result->size); |
| assert(node->lnkcnt == result->lnkcnt); |
| assert(node->type == result->type || result->type == VFS_NODE_UNKNOWN); |
| _vfs_node_addref(node); |
| futex_up(&nodes_futex); |
| /branches/dynload/uspace/srv/vfs/vfs_lookup.c |
|---|
| 182,6 → 182,12 |
| result->triplet.index = (fs_index_t) IPC_GET_ARG3(answer); |
| result->size = (size_t) IPC_GET_ARG4(answer); |
| result->lnkcnt = (unsigned) IPC_GET_ARG5(answer); |
| if (lflag & L_FILE) |
| result->type = VFS_NODE_FILE; |
| else if (lflag & L_DIRECTORY) |
| result->type = VFS_NODE_DIRECTORY; |
| else |
| result->type = VFS_NODE_UNKNOWN; |
| } |
| return rc; |