Changeset 3f0a7971 in mainline for uspace/srv/vfs/vfs_node.c

Timestamp:

2010-11-18T22:34:23Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

63b4f90

Parents:

c7137738 (diff), 45f04f8 (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.

Message:

Merge mainline changes

Updated srv/hw/bus/usb/hcd/virtual to use new type names (devmap_handle_t).

File:

• uspace/srv/vfs/vfs_node.c (modified) (8 diffs)

uspace/srv/vfs/vfs_node.c

@@ -113 +113 @@
                 unsigned long key[] = {
                         [KEY_FS_HANDLE] = node->fs_handle,
-                        [KEY_DEV_HANDLE] = node->dev_handle,
+                        [KEY_DEV_HANDLE] = node->devmap_handle,
                         [KEY_INDEX] = node->index
                 };
@@ -131 +131 @@
                 ipcarg_t rc;
                 rc = async_req_2_0(phone, VFS_OUT_DESTROY,
-                    (ipcarg_t)node->dev_handle, (ipcarg_t)node->index);
+                    (ipcarg_t)node->devmap_handle, (ipcarg_t)node->index);
                 assert(rc == EOK);
                 vfs_release_phone(node->fs_handle, phone);
@@ -151 +151 @@
         unsigned long key[] = {
                 [KEY_FS_HANDLE] = node->fs_handle,
-                [KEY_DEV_HANDLE] = node->dev_handle,
+                [KEY_DEV_HANDLE] = node->devmap_handle,
                 [KEY_INDEX] = node->index
         };
@@ -175 +175 @@
         unsigned long key[] = {
                 [KEY_FS_HANDLE] = result->triplet.fs_handle,
-                [KEY_DEV_HANDLE] = result->triplet.dev_handle,
+                [KEY_DEV_HANDLE] = result->triplet.devmap_handle,
                 [KEY_INDEX] = result->triplet.index
         };
@@ -191 +191 @@
                 memset(node, 0, sizeof(vfs_node_t));
                 node->fs_handle = result->triplet.fs_handle;
-                node->dev_handle = result->triplet.dev_handle;
+                node->devmap_handle = result->triplet.devmap_handle;
                 node->index = result->triplet.index;
                 node->size = result->size;
@@ -243 +243 @@
         vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
         return (node->fs_handle == (fs_handle_t) key[KEY_FS_HANDLE]) &&
-            (node->dev_handle == key[KEY_DEV_HANDLE]) &&
+            (node->devmap_handle == key[KEY_DEV_HANDLE]) &&
             (node->index == key[KEY_INDEX]);
 }
@@ -255 +255 @@
         unsigned refcnt;
         fs_handle_t fs_handle;
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 };
 
@@ -264 +264 @@
 
         if ((node->fs_handle == rd->fs_handle) &&
-            (node->dev_handle == rd->dev_handle))
+            (node->devmap_handle == rd->devmap_handle))
                 rd->refcnt += node->refcnt;
 }
 
 unsigned
-vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, dev_handle_t dev_handle)
+vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, devmap_handle_t devmap_handle)
 {
         struct refcnt_data rd = {
                 .refcnt = 0,
                 .fs_handle = fs_handle,
-                .dev_handle = dev_handle
+                .devmap_handle = devmap_handle
         };