Changeset 903bac0a in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2011-08-19T09:00:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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.

File:

• uspace/srv/vfs/vfs.h (modified) (4 diffs)

uspace/srv/vfs/vfs.h

@@ -38 +38 @@
 #include <fibril_synch.h>
 #include <sys/types.h>
-#include <devmap.h>
+#include <loc.h>
 #include <bool.h>
 #include <ipc/vfs.h>
@@ -61 +61 @@
 #define VFS_PAIR \
         fs_handle_t fs_handle; \
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
 
 /**
@@ -67 +67 @@
  * doesn't contain any state. For a stateful structure, see vfs_node_t.
  *
- * @note        fs_handle, devmap_handle and index are meant to be returned in one
+ * @note        fs_handle, service_id and index are meant to be returned in one
  *              IPC reply.
  */
@@ -180 +180 @@
 extern void vfs_node_put(vfs_node_t *);
 extern void vfs_node_forget(vfs_node_t *);
-extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, devmap_handle_t);
+extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, service_id_t);