Changeset 45f04f8 in mainline for uspace/srv/vfs/vfs_node.c
- Timestamp:
- 2010-11-18T18:23:43Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3f0a7971, a7811f17, cb569e6
- Parents:
- 51a268f (diff), c63e70c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/vfs/vfs_node.c
r51a268f r45f04f8 113 113 unsigned long key[] = { 114 114 [KEY_FS_HANDLE] = node->fs_handle, 115 [KEY_DEV_HANDLE] = node->dev _handle,115 [KEY_DEV_HANDLE] = node->devmap_handle, 116 116 [KEY_INDEX] = node->index 117 117 }; … … 131 131 ipcarg_t rc; 132 132 rc = async_req_2_0(phone, VFS_OUT_DESTROY, 133 (ipcarg_t)node->dev _handle, (ipcarg_t)node->index);133 (ipcarg_t)node->devmap_handle, (ipcarg_t)node->index); 134 134 assert(rc == EOK); 135 135 vfs_release_phone(node->fs_handle, phone); … … 151 151 unsigned long key[] = { 152 152 [KEY_FS_HANDLE] = node->fs_handle, 153 [KEY_DEV_HANDLE] = node->dev _handle,153 [KEY_DEV_HANDLE] = node->devmap_handle, 154 154 [KEY_INDEX] = node->index 155 155 }; … … 175 175 unsigned long key[] = { 176 176 [KEY_FS_HANDLE] = result->triplet.fs_handle, 177 [KEY_DEV_HANDLE] = result->triplet.dev _handle,177 [KEY_DEV_HANDLE] = result->triplet.devmap_handle, 178 178 [KEY_INDEX] = result->triplet.index 179 179 }; … … 191 191 memset(node, 0, sizeof(vfs_node_t)); 192 192 node->fs_handle = result->triplet.fs_handle; 193 node->dev _handle = result->triplet.dev_handle;193 node->devmap_handle = result->triplet.devmap_handle; 194 194 node->index = result->triplet.index; 195 195 node->size = result->size; … … 243 243 vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link); 244 244 return (node->fs_handle == (fs_handle_t) key[KEY_FS_HANDLE]) && 245 (node->dev _handle == key[KEY_DEV_HANDLE]) &&245 (node->devmap_handle == key[KEY_DEV_HANDLE]) && 246 246 (node->index == key[KEY_INDEX]); 247 247 } … … 255 255 unsigned refcnt; 256 256 fs_handle_t fs_handle; 257 dev _handle_t dev_handle;257 devmap_handle_t devmap_handle; 258 258 }; 259 259 … … 264 264 265 265 if ((node->fs_handle == rd->fs_handle) && 266 (node->dev _handle == rd->dev_handle))266 (node->devmap_handle == rd->devmap_handle)) 267 267 rd->refcnt += node->refcnt; 268 268 } 269 269 270 270 unsigned 271 vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, dev _handle_t dev_handle)271 vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, devmap_handle_t devmap_handle) 272 272 { 273 273 struct refcnt_data rd = { 274 274 .refcnt = 0, 275 275 .fs_handle = fs_handle, 276 .dev _handle = dev_handle276 .devmap_handle = devmap_handle 277 277 }; 278 278
Note:
See TracChangeset
for help on using the changeset viewer.