Changeset 0b749a3 in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2010-11-22T15:39:53Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:

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

uspace/srv/vfs/vfs.h

@@ -62 +62 @@
 #define VFS_PAIR \
         fs_handle_t fs_handle; \
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 
 /**
@@ -68 +68 @@
  * doesn't contain any state. For a stateful structure, see vfs_node_t.
  *
- * @note        fs_handle, dev_handle and index are meant to be returned in one
+ * @note        fs_handle, devmap_handle and index are meant to be returned in one
  *              IPC reply.
  */
@@ -169 +169 @@
 
 extern int vfs_grab_phone(fs_handle_t);
-extern void vfs_release_phone(int);
+extern void vfs_release_phone(fs_handle_t, int);
 
 extern fs_handle_t fs_name_to_handle(char *, bool);
@@ -182 +182 @@
 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, dev_handle_t);
+extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, devmap_handle_t);