Changeset eb27ce5a in mainline for uspace/srv/vfs/vfs_node.c

Timestamp:

2008-01-09T19:50:40Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4fb6bf36

Parents:

cad9c72

Message:

Improve the API for converting (VFS triplets, size) to VFS nodes by introducing
a new type for results of vfs_lookup_internal().

File:

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

uspace/srv/vfs/vfs_node.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jakub Jermar
+ * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
  *
@@ -122 +122 @@
  * vfs_node_put() on it.
  *
- * @param triplet       Triplet encoding the identity of the VFS node.
- * @param size          Size of the node as filled by vfs_lookup_internal().
+ * @param result        Populated lookup result structure.
  *
  * @return              VFS node corresponding to the given triplet.
  */
-vfs_node_t *vfs_node_get(vfs_triplet_t *triplet, size_t size)
+vfs_node_t *vfs_node_get(vfs_lookup_res_t *result)
 {
         unsigned long key[] = {
-                [KEY_FS_HANDLE] = triplet->fs_handle,
-                [KEY_DEV_HANDLE] = triplet->dev_handle,
-                [KEY_INDEX] = triplet->index
+                [KEY_FS_HANDLE] = result->triplet.fs_handle,
+                [KEY_DEV_HANDLE] = result->triplet.dev_handle,
+                [KEY_INDEX] = result->triplet.index
         };
         link_t *tmp;
@@ -146 +145 @@
                 }
                 memset(node, 0, sizeof(vfs_node_t));
-                node->fs_handle = triplet->fs_handle;
-                node->dev_handle = triplet->fs_handle;
-                node->index = triplet->index;
-                node->size = size;
+                node->fs_handle = result->triplet.fs_handle;
+                node->dev_handle = result->triplet.fs_handle;
+                node->index = result->triplet.index;
+                node->size = result->size;
                 link_initialize(&node->nh_link);
                 rwlock_initialize(&node->contents_rwlock);
@@ -157 +156 @@
         }
 
-        assert(node->size == size);
+        assert(node->size == result->size);
 
         _vfs_node_addref(node);