Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 991f645 in mainline for uspace/srv/vfs/vfs_node.c


Ignore:
Timestamp:
2010-11-18T17:39:28Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
Children:
0b5a4131
Parents:
51a268f
Message:

Rename dev_handle_t to devmap_handle_t and make it explicitly clear that
dev_handle_t is a handle understood by devmap.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/vfs/vfs_node.c

    r51a268f r991f645  
    113113                unsigned long key[] = {
    114114                        [KEY_FS_HANDLE] = node->fs_handle,
    115                         [KEY_DEV_HANDLE] = node->dev_handle,
     115                        [KEY_DEV_HANDLE] = node->devmap_handle,
    116116                        [KEY_INDEX] = node->index
    117117                };
     
    131131                ipcarg_t rc;
    132132                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);
    134134                assert(rc == EOK);
    135135                vfs_release_phone(node->fs_handle, phone);
     
    151151        unsigned long key[] = {
    152152                [KEY_FS_HANDLE] = node->fs_handle,
    153                 [KEY_DEV_HANDLE] = node->dev_handle,
     153                [KEY_DEV_HANDLE] = node->devmap_handle,
    154154                [KEY_INDEX] = node->index
    155155        };
     
    175175        unsigned long key[] = {
    176176                [KEY_FS_HANDLE] = result->triplet.fs_handle,
    177                 [KEY_DEV_HANDLE] = result->triplet.dev_handle,
     177                [KEY_DEV_HANDLE] = result->triplet.devmap_handle,
    178178                [KEY_INDEX] = result->triplet.index
    179179        };
     
    191191                memset(node, 0, sizeof(vfs_node_t));
    192192                node->fs_handle = result->triplet.fs_handle;
    193                 node->dev_handle = result->triplet.dev_handle;
     193                node->devmap_handle = result->triplet.devmap_handle;
    194194                node->index = result->triplet.index;
    195195                node->size = result->size;
     
    243243        vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
    244244        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]) &&
    246246            (node->index == key[KEY_INDEX]);
    247247}
     
    255255        unsigned refcnt;
    256256        fs_handle_t fs_handle;
    257         dev_handle_t dev_handle;
     257        devmap_handle_t devmap_handle;
    258258};
    259259
     
    264264
    265265        if ((node->fs_handle == rd->fs_handle) &&
    266             (node->dev_handle == rd->dev_handle))
     266            (node->devmap_handle == rd->devmap_handle))
    267267                rd->refcnt += node->refcnt;
    268268}
    269269
    270270unsigned
    271 vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, dev_handle_t dev_handle)
     271vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, devmap_handle_t devmap_handle)
    272272{
    273273        struct refcnt_data rd = {
    274274                .refcnt = 0,
    275275                .fs_handle = fs_handle,
    276                 .dev_handle = dev_handle
     276                .devmap_handle = devmap_handle
    277277        };
    278278
Note: See TracChangeset for help on using the changeset viewer.